This commit was manufactured by cvs2svn to create tag 'RELEASE_4_10_0'.release/4.10.0

792 files changed, 0 insertions, 41630 deletions

diff --git a/net/AquaGatekeeper2/Makefile b/net/AquaGatekeeper2/Makefile
deleted file mode 100644
index c3bdab0c447b..000000000000
--- a/net/AquaGatekeeper2/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# New ports collection makefile for:   AquaGatekeeper
-# Date created:        2 November 2003
-# Whom:                Eugene Grosbein <eugen@grosbein.pp.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	AquaGatekeeper
-PORTVERSION=	1.22
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.aqua.comptek.ru/pub/GateKeeper/ \
-		ftp://www.kuzbass.ru/pub/FreeBSD/ports/distfiles/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	eugen@grosbein.pp.ru
-COMMENT=	Aqua H323 Gatekeeper and proxy
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-NO_BUILD=	yes
-ONLY_FOR_ARCHS=	amd64 i386
-MD5_FILE=	${MASTERDIR}/distinfo.${ARCH}
-
-NO_PACKAGE=	"No commercial redistribution"
-NO_CDROM=	"No commercial redistribution"
-
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-IS_INTERACTIVE=	yes
-.endif
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/AquaGatekeeper ${PREFIX}/sbin/
-	@${INSTALL_SCRIPT} ${FILESDIR}/agk.sh.sample ${PREFIX}/etc/rc.d/
-	@${INSTALL_DATA} ${WRKSRC}/Config/AquaGatekeeper.cfg ${PREFIX}/etc/AquaGatekeeper.cfg.sample
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Config/Example.cfg ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@for docfile in ${WRKSRC}/Help/*; \
-		do ${INSTALL_MAN} $$docfile ${DOCSDIR}; \
-	done
-	@${MKDIR} ${DOCSDIR}/Rus
-	@for docfile in ${WRKSRC}/Help.Rus/*; \
-		do ${INSTALL_MAN} $$docfile ${DOCSDIR}/Rus; \
-	done
-.endif
-
-post-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${SED} "s'%%PREFIX%%'${PREFIX}'" < pkg-message
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400000
-BROKEN=		"Supported only on 4.x systems and later"
-.elif ${OSVERSION} >= 500000 && ${ARCH} == "i386"
-LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
-.endif
-
-.if ${ARCH} == "amd64"
-DISTNAME=	AquaGatekeeper122FreeBSDamd64
-.else
-DISTNAME=	AquaGatekeeper122FreeBSD
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/AquaGatekeeper2/distinfo.amd64 b/net/AquaGatekeeper2/distinfo.amd64
deleted file mode 100644
index a11cf668b03f..000000000000
--- a/net/AquaGatekeeper2/distinfo.amd64
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (AquaGatekeeper122FreeBSDamd64.tgz) = bf08f20bd78185d201bf1093648e4769
-SIZE (AquaGatekeeper122FreeBSDamd64.tgz) = 676023
diff --git a/net/AquaGatekeeper2/distinfo.i386 b/net/AquaGatekeeper2/distinfo.i386
deleted file mode 100644
index e46270300daa..000000000000
--- a/net/AquaGatekeeper2/distinfo.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (AquaGatekeeper122FreeBSD.tgz) = 0a176b6581f8b393e75466d350ba1551
-SIZE (AquaGatekeeper122FreeBSD.tgz) = 761278
diff --git a/net/AquaGatekeeper2/files/agk.sh.sample b/net/AquaGatekeeper2/files/agk.sh.sample
deleted file mode 100644
index c989f61899db..000000000000
--- a/net/AquaGatekeeper2/files/agk.sh.sample
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-PREFIX=$(expr `realpath $0` : "\(/.*\)/etc/rc\.d/`basename $0`\$")
-PROG=$PREFIX/sbin/AquaGatekeeper
-CFG=$PREFIX/etc/agk.cfg
-TIMEOUT=30
-
-case "$1" in
-start)
-	shift
-	su -m agk -c "[ -x $PROG -a -r $CFG ] &&
-	  echo -n ' AquaGatekeeper' && $PROG -d --configuration=$CFG $@"
-	;;
-stop)
-	shift
-	signal=-TERM
-	[ -n "$1" ] && signal="$1"
-	killall $signal AquaGatekeeper
-	[ $signal != -2 -a $signal != -INT ] && exit 0
-	i=1
-	while [ $i -le $TIMEOUT ]
-	do
-	  ps -axc | grep -q AquaGatekeeper || break
-	  i=$(($i+1))
-	  sleep 1
-	done
-	;;
-restart)
-	`realpath $0` stop -INT
-	`realpath $0` start
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop|restart}" >&2
-	;;
-esac
-
-exit 0
diff --git a/net/AquaGatekeeper2/pkg-deinstall b/net/AquaGatekeeper2/pkg-deinstall
deleted file mode 100644
index d89d859698b4..000000000000
--- a/net/AquaGatekeeper2/pkg-deinstall
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-USER=agk
-GROUP=agk
-
-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
-
-    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
-	pw userdel -n ${u}
-	echo "Done."
-    fi
-}
-
-[ "$2" = DEINSTALL ] || exit 0
-
-export PATH=/bin:/usr/bin:/usr/sbin
-
-if ps -axc | grep -q AquaGatekeeper; then
-    if yesno "There are some AquaGatekeeper processes running.  Shall I kill them" y
-    then
-	killall AquaGatekeeper
-	sleep 2
-    else
-	echo "OK ... I hope you know what you are doing."
-    fi
-fi
-
-delete_account ${USER} ${GROUP}
-exit 0
diff --git a/net/AquaGatekeeper2/pkg-descr b/net/AquaGatekeeper2/pkg-descr
deleted file mode 100644
index a8ba595db4a2..000000000000
--- a/net/AquaGatekeeper2/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Aqua Gatekeeper is H.323 gatekeeper and proxy by Aqua Project Group.
-It is compatible with many hardware/software like Cisco H.323 gateways and
-Microsoft NetMeeting 3.01 for Windows 2000 and later.
-
-This port presents Aqua Gatekeeper Startup Edition.
-It is not a free software but may be used free of charge.
-The Aqua Gatekeeper Startup Edition is limited to 30 concurrent calls.
-
-WWW: http://www.aqua.comptek.ru/man/voip/gatekeeper/index.htm
-
-- Grosbein
-eugen@grosbein.pp.ru
diff --git a/net/AquaGatekeeper2/pkg-install b/net/AquaGatekeeper2/pkg-install
deleted file mode 100644
index 233bb70ff96a..000000000000
--- a/net/AquaGatekeeper2/pkg-install
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-USER=agk
-UID=172
-GROUP=${USER}
-GID=${UID}
-
-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 uid gid gcos
-
-    u=$1
-    uid=$2
-    g=$3
-    gid=$4
-    gcos=$5
-
-    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 -n ${g} -g ${gid} || 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 -n ${u} -u ${uid} -g ${g} -h - -d /nonexistent \
-		-s /nonexistent -c "${gcos}" || exit
-	    echo "Done."
-	else
-	    echo "Please create it, and try again."
-	    exit 1
-	fi
-    fi
-}
-
-[ "$2" = POST-INSTALL ] || exit 0
-
-make_account ${USER} ${UID} ${GROUP} ${GID} "AquaGateKeeper"
diff --git a/net/AquaGatekeeper2/pkg-message b/net/AquaGatekeeper2/pkg-message
deleted file mode 100644
index 005fb0e618f2..000000000000
--- a/net/AquaGatekeeper2/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-****************************************************************************
-  Please read documentation located in %%PREFIX%%/share/doc/AquaGatekeeper
-  You will need to write configuration file to run the Gatekeeper.
-  Some examples are in %%PREFIX%%/share/examples/AquaGatekeeper
-****************************************************************************
diff --git a/net/AquaGatekeeper2/pkg-plist b/net/AquaGatekeeper2/pkg-plist
deleted file mode 100644
index d08193da9ea6..000000000000
--- a/net/AquaGatekeeper2/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-sbin/AquaGatekeeper
-etc/rc.d/agk.sh.sample
-etc/AquaGatekeeper.cfg.sample
-%%PORTDOCS%%%%DOCSDIR%%/AquaGatekeeper.htm
-%%PORTDOCS%%%%DOCSDIR%%/CommandLineOptions.htm
-%%PORTDOCS%%%%DOCSDIR%%/ConfigSyntax.htm
-%%PORTDOCS%%%%DOCSDIR%%/License.rtf
-%%PORTDOCS%%%%DOCSDIR%%/LicenseRus.rtf
-%%PORTDOCS%%%%DOCSDIR%%/OperationPrinciples.htm
-%%PORTDOCS%%%%DOCSDIR%%/RevisionHistory.htm
-%%PORTDOCS%%%%DOCSDIR%%/default.css
-%%PORTDOCS%%%%DOCSDIR%%/Rus/AquaGatekeeper.htm
-%%PORTDOCS%%%%DOCSDIR%%/Rus/CommandLineOptions.htm
-%%PORTDOCS%%%%DOCSDIR%%/Rus/ConfigSyntax.htm
-%%PORTDOCS%%%%DOCSDIR%%/Rus/OperationPrinciples.htm
-%%PORTDOCS%%%%DOCSDIR%%/Rus/RevisionHistory.htm
-%%PORTDOCS%%%%DOCSDIR%%/Rus/default.css
-%%EXAMPLESDIR%%/Example.cfg
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Rus
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/net/amule-devel/Makefile b/net/amule-devel/Makefile
deleted file mode 100644
index 478895b7c86a..000000000000
--- a/net/amule-devel/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# New ports collection makefile for:	amule
-# Date created:		Wed Nov 05 09:30:00 UTC 2003
-# Whom:			Ganael LAPLANCHE <ganael.laplanche@martymac.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	aMule
-PORTVERSION=	1.2.6
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	http://download.berlios.de/amule/
-
-MAINTAINER=	ganael.laplanche@martymac.com
-COMMENT=	Just another eMule P2P Client
-
-LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \
-		curl.2:${PORTSDIR}/ftp/curl
-
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomehier gnomehack gnomeprefix
-USE_REINPLACE=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-included-gettext \
-		--with-libintl-prefix=${LOCALBASE} \
-		--with-libiconv-prefix=${LOCALBASE} \
-		--with-wx-config=${WX_CONFIG} \
-		--with-wxbase-config=${WX_CONFIG}
-
-OPTIONS=	OPTIMIZE "Build with optimization" off \
-		STATIC "Enable static linking" off \
-		RELGRP "Use release group code" off
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-WX_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
-
-# Configure options
-.if defined(WITH_OPTIMIZE)
-CONFIGURE_ARGS+=	--enable-optimise
-.endif
-
-.if defined(WITH_STATIC)
-CONFIGURE_ARGS+=	--enable-static
-.endif
-
-.if defined(WITH_RELGRP)
-CONFIGURE_ARGS+=	--enable-releasegrp
-.endif
-
-post-build:
-# Build the generic named ed2k binary
-# It will be installed in an adhoc fashion
-	@cd ${BUILD_WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ed2k
-
-post-install:
-# Do not install a generic named ed2k binary
-# Install it under a more specific name
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/ed2k \
-		${PREFIX}/bin/amule-ed2k-handler
-
-.include <bsd.port.mk>
diff --git a/net/amule-devel/distinfo b/net/amule-devel/distinfo
deleted file mode 100644
index 413d45e5a86c..000000000000
--- a/net/amule-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (aMule-1.2.6.tar.gz) = 403c4beeb02973f87fe064105ea06d38
-SIZE (aMule-1.2.6.tar.gz) = 1810966
diff --git a/net/amule-devel/files/patch-Makefile.in b/net/amule-devel/files/patch-Makefile.in
deleted file mode 100644
index 98d1cecafe4f..000000000000
--- a/net/amule-devel/files/patch-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/Makefile.in.orig	Tue Feb 17 16:43:20 2004
-+++ src/Makefile.in	Tue Feb 17 16:43:42 2004
-@@ -197,7 +197,7 @@
- sysconfdir = @sysconfdir@
- systray = @systray@
- target_alias = @target_alias@
--bin_PROGRAMS = $(am__append_1) ed2k amule
-+bin_PROGRAMS = $(am__append_1) amule
- 
- BUILT_SOURCES = sys.h
- EXTRA_DIST = sys.h.in strings.en *.h pixmaps bitmaps Makengfile
-@@ -357,8 +357,8 @@
- CONFIG_CLEAN_FILES = timestamp-sys.h
- @COMPILE_CMD_TRUE@bin_PROGRAMS = amulecmd$(EXEEXT) amulecmdDLG$(EXEEXT) \
- @COMPILE_CMD_TRUE@	amuleweb$(EXEEXT) amulewebDLG$(EXEEXT) \
--@COMPILE_CMD_TRUE@	ed2k$(EXEEXT) amule$(EXEEXT)
--@COMPILE_CMD_FALSE@bin_PROGRAMS = ed2k$(EXEEXT) amule$(EXEEXT)
-+@COMPILE_CMD_TRUE@	amule$(EXEEXT)
-+@COMPILE_CMD_FALSE@bin_PROGRAMS = amule$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS)
- 
- am__amule_SOURCES_DIST = ListenSocket.cpp EMSocket.cpp AddFriend.cpp \
diff --git a/net/amule-devel/files/patch-SysTray.cpp b/net/amule-devel/files/patch-SysTray.cpp
deleted file mode 100644
index baa445536165..000000000000
--- a/net/amule-devel/files/patch-SysTray.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/SysTray.cpp.orig	Tue Feb 17 16:43:12 2004
-+++ src/SysTray.cpp	Tue Feb 17 16:43:53 2004
-@@ -22,8 +22,8 @@
- #include "sys.h"
- #include <libintl.h>
- #include <clocale>		// Needed for setlocale(3)
--#include <net/if.h>		// Needed for struct ifreq
- #include <sys/socket.h>		//
-+#include <net/if.h>		// Needed for struct ifreq
- #include <netinet/in.h>		// Needed for inet_ntoa
- #include <arpa/inet.h>		//
- #include <sys/ioctl.h>		// Needed for SIOCGIFADDR
diff --git a/net/amule-devel/pkg-descr b/net/amule-devel/pkg-descr
deleted file mode 100644
index ac1cebd14f66..000000000000
--- a/net/amule-devel/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-aMule - aNOTHER eMule P2P Client
-
-This program is a multiplatform fork of
- xMule client using wxWindows class library.
-
-WWW: http://www.amule.org
diff --git a/net/amule-devel/pkg-plist b/net/amule-devel/pkg-plist
deleted file mode 100644
index 2bd659a7abb5..000000000000
--- a/net/amule-devel/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-bin/amule
-bin/amule-ed2k-handler
-bin/amulecmd
-bin/amulecmdDLG
-bin/amuleweb
-bin/amulewebDLG
-share/gnome/applications/amule.desktop
-share/gnome/pixmaps/amule.xpm
-share/locale/bg/LC_MESSAGES/amule.mo
-share/locale/de/LC_MESSAGES/amule.mo
-share/locale/ee/LC_MESSAGES/amule.mo
-share/locale/en/LC_MESSAGES/amule.mo
-share/locale/es/LC_MESSAGES/amule.mo
-share/locale/es_MX/LC_MESSAGES/amule.mo
-share/locale/eu/LC_MESSAGES/amule.mo
-share/locale/fr/LC_MESSAGES/amule.mo
-share/locale/gl/LC_MESSAGES/amule.mo
-share/locale/it/LC_MESSAGES/amule.mo
-share/locale/ko/LC_MESSAGES/amule.mo
-share/locale/nl/LC_MESSAGES/amule.mo
-share/locale/pl/LC_MESSAGES/amule.mo
-share/locale/pt_BR/LC_MESSAGES/amule.mo
-share/locale/ru/LC_MESSAGES/amule.mo
diff --git a/net/amule1/Makefile b/net/amule1/Makefile
deleted file mode 100644
index 478895b7c86a..000000000000
--- a/net/amule1/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# New ports collection makefile for:	amule
-# Date created:		Wed Nov 05 09:30:00 UTC 2003
-# Whom:			Ganael LAPLANCHE <ganael.laplanche@martymac.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	aMule
-PORTVERSION=	1.2.6
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	http://download.berlios.de/amule/
-
-MAINTAINER=	ganael.laplanche@martymac.com
-COMMENT=	Just another eMule P2P Client
-
-LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \
-		curl.2:${PORTSDIR}/ftp/curl
-
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomehier gnomehack gnomeprefix
-USE_REINPLACE=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-included-gettext \
-		--with-libintl-prefix=${LOCALBASE} \
-		--with-libiconv-prefix=${LOCALBASE} \
-		--with-wx-config=${WX_CONFIG} \
-		--with-wxbase-config=${WX_CONFIG}
-
-OPTIONS=	OPTIMIZE "Build with optimization" off \
-		STATIC "Enable static linking" off \
-		RELGRP "Use release group code" off
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-WX_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
-
-# Configure options
-.if defined(WITH_OPTIMIZE)
-CONFIGURE_ARGS+=	--enable-optimise
-.endif
-
-.if defined(WITH_STATIC)
-CONFIGURE_ARGS+=	--enable-static
-.endif
-
-.if defined(WITH_RELGRP)
-CONFIGURE_ARGS+=	--enable-releasegrp
-.endif
-
-post-build:
-# Build the generic named ed2k binary
-# It will be installed in an adhoc fashion
-	@cd ${BUILD_WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ed2k
-
-post-install:
-# Do not install a generic named ed2k binary
-# Install it under a more specific name
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/ed2k \
-		${PREFIX}/bin/amule-ed2k-handler
-
-.include <bsd.port.mk>
diff --git a/net/amule1/distinfo b/net/amule1/distinfo
deleted file mode 100644
index 413d45e5a86c..000000000000
--- a/net/amule1/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (aMule-1.2.6.tar.gz) = 403c4beeb02973f87fe064105ea06d38
-SIZE (aMule-1.2.6.tar.gz) = 1810966
diff --git a/net/amule1/files/patch-Makefile.in b/net/amule1/files/patch-Makefile.in
deleted file mode 100644
index 98d1cecafe4f..000000000000
--- a/net/amule1/files/patch-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/Makefile.in.orig	Tue Feb 17 16:43:20 2004
-+++ src/Makefile.in	Tue Feb 17 16:43:42 2004
-@@ -197,7 +197,7 @@
- sysconfdir = @sysconfdir@
- systray = @systray@
- target_alias = @target_alias@
--bin_PROGRAMS = $(am__append_1) ed2k amule
-+bin_PROGRAMS = $(am__append_1) amule
- 
- BUILT_SOURCES = sys.h
- EXTRA_DIST = sys.h.in strings.en *.h pixmaps bitmaps Makengfile
-@@ -357,8 +357,8 @@
- CONFIG_CLEAN_FILES = timestamp-sys.h
- @COMPILE_CMD_TRUE@bin_PROGRAMS = amulecmd$(EXEEXT) amulecmdDLG$(EXEEXT) \
- @COMPILE_CMD_TRUE@	amuleweb$(EXEEXT) amulewebDLG$(EXEEXT) \
--@COMPILE_CMD_TRUE@	ed2k$(EXEEXT) amule$(EXEEXT)
--@COMPILE_CMD_FALSE@bin_PROGRAMS = ed2k$(EXEEXT) amule$(EXEEXT)
-+@COMPILE_CMD_TRUE@	amule$(EXEEXT)
-+@COMPILE_CMD_FALSE@bin_PROGRAMS = amule$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS)
- 
- am__amule_SOURCES_DIST = ListenSocket.cpp EMSocket.cpp AddFriend.cpp \
diff --git a/net/amule1/files/patch-SysTray.cpp b/net/amule1/files/patch-SysTray.cpp
deleted file mode 100644
index baa445536165..000000000000
--- a/net/amule1/files/patch-SysTray.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/SysTray.cpp.orig	Tue Feb 17 16:43:12 2004
-+++ src/SysTray.cpp	Tue Feb 17 16:43:53 2004
-@@ -22,8 +22,8 @@
- #include "sys.h"
- #include <libintl.h>
- #include <clocale>		// Needed for setlocale(3)
--#include <net/if.h>		// Needed for struct ifreq
- #include <sys/socket.h>		//
-+#include <net/if.h>		// Needed for struct ifreq
- #include <netinet/in.h>		// Needed for inet_ntoa
- #include <arpa/inet.h>		//
- #include <sys/ioctl.h>		// Needed for SIOCGIFADDR
diff --git a/net/amule1/pkg-descr b/net/amule1/pkg-descr
deleted file mode 100644
index ac1cebd14f66..000000000000
--- a/net/amule1/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-aMule - aNOTHER eMule P2P Client
-
-This program is a multiplatform fork of
- xMule client using wxWindows class library.
-
-WWW: http://www.amule.org
diff --git a/net/amule1/pkg-plist b/net/amule1/pkg-plist
deleted file mode 100644
index 2bd659a7abb5..000000000000
--- a/net/amule1/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-bin/amule
-bin/amule-ed2k-handler
-bin/amulecmd
-bin/amulecmdDLG
-bin/amuleweb
-bin/amulewebDLG
-share/gnome/applications/amule.desktop
-share/gnome/pixmaps/amule.xpm
-share/locale/bg/LC_MESSAGES/amule.mo
-share/locale/de/LC_MESSAGES/amule.mo
-share/locale/ee/LC_MESSAGES/amule.mo
-share/locale/en/LC_MESSAGES/amule.mo
-share/locale/es/LC_MESSAGES/amule.mo
-share/locale/es_MX/LC_MESSAGES/amule.mo
-share/locale/eu/LC_MESSAGES/amule.mo
-share/locale/fr/LC_MESSAGES/amule.mo
-share/locale/gl/LC_MESSAGES/amule.mo
-share/locale/it/LC_MESSAGES/amule.mo
-share/locale/ko/LC_MESSAGES/amule.mo
-share/locale/nl/LC_MESSAGES/amule.mo
-share/locale/pl/LC_MESSAGES/amule.mo
-share/locale/pt_BR/LC_MESSAGES/amule.mo
-share/locale/ru/LC_MESSAGES/amule.mo
diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile
deleted file mode 100644
index 82db2899e80a..000000000000
--- a/net/asterisk-bristuff/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for:	asterisk
-# Date created:				17 October 2003
-# Whom:					Maxim Sobolev <sobomax@portaone.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	asterisk
-PORTVERSION=	0.7.2
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
-		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
-
-MAINTAINER=	sobomax@FreeBSD.org
-COMMENT=	An Open Source PBX and telephony toolkit
-
-FORBIDDEN=	http://people.freebsd.org/~eik/portaudit/27c331d5-64c7-11d8-80e3-0020ed76ef5a.html
-
-ONLY_FOR_ARCHS=	i386
-
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
-		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
-LIB_DEPENDS=	speex.2:${PORTSDIR}/audio/speex
-RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
-
-GNU_CONFIGURE=	yes
-CONFIGURE_WRKSRC=	${WRKSRC}/editline
-USE_GMAKE=	yes
-USE_OPENLDAP=	yes
-MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		MKDIR="${MKDIR}" \
-		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \
-		OSVERSION=${OSVERSION} \
-		CXX="${CXX}"
-
-.include <bsd.port.mk>
diff --git a/net/asterisk-bristuff/distinfo b/net/asterisk-bristuff/distinfo
deleted file mode 100644
index 13e376bb0fae..000000000000
--- a/net/asterisk-bristuff/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (asterisk-0.7.2.tar.gz) = a1f9485f5f85a4e4129782b6e642e236
-SIZE (asterisk-0.7.2.tar.gz) = 2779788
diff --git a/net/asterisk-bristuff/files/patch-Makefile b/net/asterisk-bristuff/files/patch-Makefile
deleted file mode 100644
index 1e4ffbe62070..000000000000
--- a/net/asterisk-bristuff/files/patch-Makefile
+++ /dev/null
@@ -1,301 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig	Wed Jan 14 08:48:38 2004
-+++ Makefile	Fri Jan 30 02:25:09 2004
-@@ -43,10 +43,10 @@
- #K6OPT  = -DK6OPT
- 
- #Tell gcc to optimize the asterisk's code
--OPTIMIZE=-O6
-+#OPTIMIZE=-O6
- 
- #Include debug symbols in the executables (-g) and profiling info (-pg)
--DEBUG=-g #-pg
-+#DEBUG=-g #-pg
- 
- # New hangup routines for chan_zap.c
- # If this flag is uncommented then you need to have new libpri code in your system
-@@ -68,7 +68,7 @@
- 
- # Where to install asterisk after compiling
- # Default -> leave empty
--INSTALL_PREFIX=
-+INSTALL_PREFIX=$(PREFIX)
- 
- # Staging directory
- # Files are copied here temporarily during the install process
-@@ -88,28 +88,26 @@
- # Don't use together with -DBUSYDETECT_TONEONLY
- BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
- 
--ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
--ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
-+ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk
-+ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk
- ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
--ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
--ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
--ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
-+ASTSPOOLDIR=/var/spool/asterisk
-+ASTLOGDIR=/var/log/asterisk
-+ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk
- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
--ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
--ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
--ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
-+ASTBINDIR=$(INSTALL_PREFIX)/bin
-+ASTSBINDIR=$(INSTALL_PREFIX)/sbin
-+ASTVARRUNDIR=/var/run
- 
- MODULES_DIR=$(ASTLIBDIR)/modules
- AGI_DIR=$(ASTVARLIBDIR)/agi-bin
- 
- INCLUDE=-Iinclude -I../include
--CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
- CFLAGS+=$(OPTIMIZE)
--CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- ifeq (${OSARCH},FreeBSD)
--CFLAGS+=-pthread
--INCLUDE+=-I/usr/local/include
-+CFLAGS+=$(PTHREAD_CFLAGS)
- endif
- ifeq (${OSARCH},OpenBSD)
- CFLAGS+=-pthread
-@@ -151,7 +149,7 @@
- LIBS=-pthread
- else
- ifeq (${OSARCH},FreeBSD)
--LIBS=-pthread
-+LIBS=$(PTHREAD_LIBS)
- else
- endif
- endif
-@@ -179,7 +177,7 @@
- SOLINK=-shared -Xlinker -x
- endif
- 
--CC=gcc
-+CC?=gcc
- INSTALL=install
- 
- _all: all
-@@ -200,13 +198,13 @@
- 	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
- 	$(MAKE) -C editline libedit.a
- 
--db1-ast/libdb1.a: FORCE
--	@if [ -d db1-ast ]; then \
--		$(MAKE) -C db1-ast libdb1.a ; \
--	else \
--		echo "You need to do a cvs update -d not just cvs update"; \
--		exit 1; \
--	fi
-+#db1-ast/libdb1.a: FORCE
-+#	@if [ -d db1-ast ]; then \
-+#		$(MAKE) -C db1-ast libdb1.a ; \
-+#	else \
-+#		echo "You need to do a cvs update -d not just cvs update"; \
-+#		exit 1; \
-+#	fi
- 
- ifneq ($(wildcard .depend),)
- include .depend
-@@ -244,8 +242,8 @@
- 		exit 1; \
- 	fi
- 
--asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
--	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a
-+asterisk: editline/libedit.a stdtime/libtime.a $(OBJS)
-+	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) stdtime/libtime.a
- 
- subdirs: 
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
-@@ -260,10 +258,10 @@
- 	$(MAKE) -C stdtime clean
- 
- datafiles: all
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
- 	for x in sounds/digits/*.gsm; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
-@@ -271,18 +269,18 @@
- 	done
- 	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-*; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
- 		fi; \
- 	done
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/images
- 	for x in images/*.jpg; do \
--		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
- 	done
--	mkdir -p $(DESTDIR)$(AGI_DIR)
-+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
- 
- update: 
- 	@if [ -d CVS ]; then \
-@@ -294,105 +292,74 @@
- 	fi
- 
- bininstall: all
--	mkdir -p $(DESTDIR)$(MODULES_DIR)
--	mkdir -p $(DESTDIR)$(ASTSBINDIR)
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	mkdir -p $(DESTDIR)$(ASTBINDIR)
--	mkdir -p $(DESTDIR)$(ASTSBINDIR)
--	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
--	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
--	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
-+	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
-+	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
- 	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
--		install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
-+		$(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
- 	fi
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
--	install -d $(DESTDIR)$(ASTHEADERDIR)
--	install -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
-+	$(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
- 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm
--	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail
--	if [ ! -h $(DESTDIR)$(ASTSPOOLDIR)/vm ] && [ -d $(DESTDIR)$(ASTSPOOLDIR)/vm ]; then \
--		mv $(DESTDIR)$(ASTSPOOLDIR)/vm $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \
--	else \
--		mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \
--		rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \
--	fi
--	ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_ixj.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_tor.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_mysql.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_unixodbc.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/codec_mp3_d.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/format_mp3.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/app_voicemail2.so
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
--	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
--	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
--	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/vm . )
--	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
--	@echo " +---- Asterisk Installation Complete -------+"  
--	@echo " +                                           +"
--	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
--	@echo " +                                           +"
--	@echo " + Asterisk has successfully been installed. +"  
--	@echo " + If you would like to install the sample   +"  
--	@echo " + configuration files (overwriting any      +"
--	@echo " + existing config files), run:              +"  
--	@echo " +                                           +"
--	@echo " +               $(MAKE) samples                +"
--	@echo " +                                           +"
--	@echo " +-----------------  or ---------------------+"
--	@echo " +                                           +"
--	@echo " + You can go ahead and install the asterisk +"
--	@echo " + program documentation now or later run:   +"
--	@echo " +                                           +"
--	@echo " +              $(MAKE) progdocs                +"
--	@echo " +                                           +"
--	@echo " + **Note** This requires that you have      +"
--	@echo " + doxygen installed on your local system    +"
--	@echo " +-------------------------------------------+"
-+	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/vm . )
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/voicemail . )
- 
--install: all datafiles bininstall
-+install: all datafiles bininstall samples
- 
- upgrade: all bininstall
- 
- adsi: all
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
- 	for x in configs/*.adsi; do \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x`-dist; \
- 		if ! [ -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \
--			install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
- 		fi ; \
- 	done
- 
- samples: all datafiles adsi
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	for x in configs/*.sample; do \
--		if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
--			mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	for x in configs/*.sample channels/h323/*.sample; do \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\
-+		if ! [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
- 		fi ; \
--		install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
- 	done
--	echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
-+	echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	if ! [ -f $(DESTDIR)$(ASTETCDIR)/asterisk.conf ]; then \
-+		$(BSD_INSTALL_DATA) $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist $(DESTDIR)$(ASTETCDIR)/asterisk.conf; \
-+	fi
- 	for x in sounds/demo-*; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
- 		fi; \
- 	done
- 	for x in sounds/*.mp3; do \
--		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
- 	done
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
- 	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
- 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
- 		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
diff --git a/net/asterisk-bristuff/files/patch-agi::Makefile b/net/asterisk-bristuff/files/patch-agi::Makefile
deleted file mode 100644
index 567c30f5624e..000000000000
--- a/net/asterisk-bristuff/files/patch-agi::Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-
-$FreeBSD$
-
---- agi/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ agi/Makefile	Fri Jan 30 02:31:07 2004
-@@ -11,21 +11,24 @@
- # the GNU General Public License
- #
- 
--AGIS=agi-test.agi eagi-test eagi-sphinx-test
-+AGIS_BIN=eagi-test eagi-sphinx-test
-+AGIS_SCR=agi-test.agi
-+AGIS=$(AGIS_SCR) $(AGIS_BIN)
- 
- CFLAGS+=
- 
- all: depend $(AGIS)
- 
- install: all
--	mkdir -p $(DESTDIR)$(AGI_DIR)
--	for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
-+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
-+	for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done
-+	for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
- 
- eagi-test: eagi-test.o
--	$(CC) -o eagi-test eagi-test.o
-+	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
- 	
- eagi-sphinx-test: eagi-sphinx-test.o
--	$(CC) -o eagi-sphinx-test eagi-sphinx-test.o
-+	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o
- 
- clean:
- 	rm -f *.so *.o look .depend
diff --git a/net/asterisk-bristuff/files/patch-apps::Makefile b/net/asterisk-bristuff/files/patch-apps::Makefile
deleted file mode 100644
index 901ba694c33a..000000000000
--- a/net/asterisk-bristuff/files/patch-apps::Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- apps/Makefile.orig	Mon Jan 12 03:56:38 2004
-+++ apps/Makefile	Fri Jan 30 01:47:34 2004
-@@ -59,17 +59,17 @@
- 	$(CC) $(SOLINK) -o $@ $< -ltonezone
- 
- install: all
--	for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- app_todd.o: app_todd.c
--	gcc -pipe -O6 -g  -Iinclude -I../include -D_REENTRANT -march=i586 -DDO_CRASH -c -o  app_todd.o app_todd.c
-+	$(CC) $(CFLAGS) -Iinclude -I../include -D_REENTRANT -DDO_CRASH -c -o  app_todd.o app_todd.c
- 
- app_todd.so: app_todd.o
--	$(CC) $(SOLINK) -o $@ $< -L/usr/local/ssl/lib -lssl -lcrypto
-+	$(CC) $(SOLINK) -o $@ $< -lssl -lcrypto
- 
- app_voicemail.so : app_voicemail.o
- ifeq ($(USE_MYSQL_VM_INTERFACE),1)
--	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient -lz
-+	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L$(LOCALBASE)/lib/mysql -lmysqlclient -lz
- else
- ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
- 	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq
-@@ -88,7 +88,7 @@
- 	$(CC) $(SOLINK) -o $@ $< -lodbc
- 
- look:	look.c
--	gcc -pipe -O6 -g look.c -o look -lncurses
-+	$(CC) $(CFLAGS) look.c -o look -lncurses
- 
- ifneq ($(wildcard .depend),)
- include .depend
diff --git a/net/asterisk-bristuff/files/patch-apps::app_intercom.c b/net/asterisk-bristuff/files/patch-apps::app_intercom.c
deleted file mode 100644
index e4ac57f8e31b..000000000000
--- a/net/asterisk-bristuff/files/patch-apps::app_intercom.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- apps/app_intercom.c.orig	Wed Oct 22 06:10:24 2003
-+++ apps/app_intercom.c	Fri Jan 30 01:52:03 2004
-@@ -29,7 +29,7 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk-bristuff/files/patch-astman::Makefile b/net/asterisk-bristuff/files/patch-astman::Makefile
deleted file mode 100644
index cf31005257cf..000000000000
--- a/net/asterisk-bristuff/files/patch-astman::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- astman/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ astman/Makefile	Fri Jan 30 01:47:34 2004
-@@ -8,7 +8,7 @@
- install:
- 	if [ "$(TARGET)" != "none" ]; then \
- 		for x in $(TARGET); do \
--			install -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/astman; \
-+			$(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/astman; \
- 		done ; \
- 	fi
- 
diff --git a/net/asterisk-bristuff/files/patch-cdr::Makefile b/net/asterisk-bristuff/files/patch-cdr::Makefile
deleted file mode 100644
index 2ede608f9019..000000000000
--- a/net/asterisk-bristuff/files/patch-cdr::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- cdr/Makefile.orig	Sun Jan 11 21:17:02 2004
-+++ cdr/Makefile	Fri Jan 30 01:47:34 2004
-@@ -43,7 +43,7 @@
- all: depend $(MODS)
- 
- install: all
--	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- clean:
- 	rm -f *.so *.o .depend
diff --git a/net/asterisk-bristuff/files/patch-channels::Makefile b/net/asterisk-bristuff/files/patch-channels::Makefile
deleted file mode 100644
index d05ee2c13676..000000000000
--- a/net/asterisk-bristuff/files/patch-channels::Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-
-$FreeBSD$
-
---- channels/Makefile.orig	Fri Jan 23 22:57:48 2004
-+++ channels/Makefile	Thu Feb 19 01:48:41 2004
-@@ -26,12 +26,10 @@
- #
- #CHANNEL_LIBS+=chan_vofr
- 
--ifneq (${OSARCH},Darwin)
- CHANNEL_LIBS+=chan_oss.so
--endif
- 
- CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
--CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
-+CHANNEL_LIBS+=chan_h323.so
- 
- CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
- CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
-@@ -99,10 +97,8 @@
- 
- chan_oss.o: chan_oss.c  busy.h ringtone.h
- 
--ifeq (${OSARCH},OpenBSD)
- chan_oss.so: chan_oss.o
--	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
--endif
-+	$(CC) $(SOLINK) -o $@ chan_oss.o
- 
- chan_iax2.so: chan_iax2.o iax2-parser.o
- ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -146,15 +142,17 @@
- chan_vpb.so: chan_vpb.o
- 	 $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl
- 
--chan_h323.so: chan_h323.o h323/libchanh323.a
--	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+chan_h323.so: chan_h323.o h323/ast_h323.o
-+	$(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
- 
-+h323/ast_h323.o:
-+	$(MAKE) -C h323 ast_h323.o
- 
- #chan_modem.so : chan_modem.o
- #	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<
- 
- install: all
--	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk-bristuff/files/patch-channels::chan_h323.c b/net/asterisk-bristuff/files/patch-channels::chan_h323.c
deleted file mode 100644
index e413bd8ecec8..000000000000
--- a/net/asterisk-bristuff/files/patch-channels::chan_h323.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_h323.c.orig	Tue Jan 13 11:24:26 2004
-+++ channels/chan_h323.c	Fri Jan 30 01:47:34 2004
-@@ -54,6 +54,7 @@
- #include <fcntl.h>
- #include <netdb.h>
- #include <sys/signal.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- 
- 
diff --git a/net/asterisk-bristuff/files/patch-channels::chan_oss.c b/net/asterisk-bristuff/files/patch-channels::chan_oss.c
deleted file mode 100644
index 1006b377874e..000000000000
--- a/net/asterisk-bristuff/files/patch-channels::chan_oss.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_oss.c.orig	Wed Oct 22 06:10:34 2003
-+++ channels/chan_oss.c	Fri Jan 30 01:50:35 2004
-@@ -36,7 +36,7 @@
- #ifdef __linux
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk-bristuff/files/patch-channels::h323::Makefile b/net/asterisk-bristuff/files/patch-channels::h323::Makefile
deleted file mode 100644
index a9159b4441c1..000000000000
--- a/net/asterisk-bristuff/files/patch-channels::h323::Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-
-$FreeBSD$
-
---- channels/h323/Makefile.orig	Sun Jan 11 04:22:32 2004
-+++ channels/h323/Makefile	Fri Jan 30 01:47:34 2004
-@@ -19,7 +19,7 @@
- #
- # This needs to be updated to deal with more than just little endian machines
- #
--CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
-+CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
- 
- 
- #############################################
-@@ -27,38 +27,39 @@
- # Only change below if you know WTF your doing
- #
- CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
--CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
--CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
-+CFLAGS += -Wall -fPIC
-+CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
- CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
- CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
- CFLAGS += -I../../include
- CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
--CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
-+CFLAGS += -I$(OPENH323DIR)/include
- 
- 
- all:   	libchanh323.a
- 
- samples: 
--	if [ -f $(ASTETCDIR)/h323.conf ]; then \
--		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
-+	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
-+	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
-+		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
- 	fi ; 
--	install h323.conf.sample $(ASTETCDIR)/h323.conf
-  
- 
- ast_h323.o:	ast_h323.cpp
--	g++ -g -c -o $@ $(CFLAGS) $<
-+	$(CXX) -c -o $@ $(CFLAGS) $<
- 
- libchanh323.a:	ast_h323.o
- 	ar cr libchanh323.a ast_h323.o
- 
- chan_h323.so:	
--	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
- 
- chan_h323_d.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
- 
- chan_h323_s.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
-+
- clean:
- 	rm -f *.o *.so core.* libchanh323.a
- 
diff --git a/net/asterisk-bristuff/files/patch-codecs::Makefile b/net/asterisk-bristuff/files/patch-codecs::Makefile
deleted file mode 100644
index b802dc1233e8..000000000000
--- a/net/asterisk-bristuff/files/patch-codecs::Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-
-$FreeBSD$
-
---- codecs/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ codecs/Makefile	Fri Jan 30 01:47:34 2004
-@@ -17,23 +17,22 @@
- # g723.1b)
- #
- #MODG723=codec_g723_1.so codec_g723_1b.so
--MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
--MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
--MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
-+MODG723=codec_g723_1_dummy.so
-+MODG729=codec_g729_dummy.so
-+MODSPEEX=codec_speex.so
- MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
--CFLAGS+=-fPIC
--CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
-+CFLAGS+=-fPIC -I$(LOCALBASE)/include
- 
- LIBG723=g723.1/libg723.a
- LIBG723B=g723.1b/libg723b.a
- LIBGSM=gsm/lib/libgsm.a
- LIBGSMT=gsm/lib/libgsm.a
- LIBLPC10=lpc10/liblpc10.a
--LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib")
-+LIBSPEEX=-L$(LOCALBASE)/lib
- LIBSPEEX+=-lspeex -lm
- LIBILBC=ilbc/libilbc.a
- 
--CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-+CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so
- 
- all: depend $(CODECS)
-@@ -88,7 +87,7 @@
- include .depend
- 
- install: all
--	for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(CODECS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk-bristuff/files/patch-codecs::codec_g723_1_dummy.c b/net/asterisk-bristuff/files/patch-codecs::codec_g723_1_dummy.c
deleted file mode 100644
index 661ff2d88602..000000000000
--- a/net/asterisk-bristuff/files/patch-codecs::codec_g723_1_dummy.c
+++ /dev/null
@@ -1,314 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g723_1_dummy.c	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,308 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Translate between signed linear and G.723.1 (dummy!)
-+ *
-+ * The G.723.1 code is not included in the Asterisk distribution because
-+ * it is covered with patents, and in spite of statements to the contrary,
-+ * the "technology" is extremely expensive to license.
-+ * 
-+ * Copyright (C) 1999, Mark Spencer
-+ *
-+ * Mark Spencer <markster@linux-support.net>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#define TYPE_HIGH	 0x0
-+#define TYPE_LOW	 0x1
-+#define TYPE_SILENCE	 0x2
-+#define TYPE_DONTSEND	 0x3
-+#define TYPE_MASK	 0x3
-+
-+#include <sys/types.h>
-+#include <asterisk/translate.h>
-+#include <asterisk/module.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/channel.h>
-+#include <pthread.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <netinet/in.h>
-+#include <string.h>
-+#include <stdio.h>
-+
-+/* Sample frame data */
-+#include "slin_g723_ex.h"
-+#include "g723_slin_ex.h"
-+
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
-+static int localusecnt=0;
-+
-+static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator";
-+
-+struct g723_encoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Buffer for our outgoing frame */
-+	char outbuf[8000];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+struct g723_decoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+static struct ast_translator_pvt *g723tolin_new()
-+{
-+	struct g723_decoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g723_decoder_pvt));
-+	if (tmp) {
-+		tmp->tail = 0;
-+		localusecnt++;
-+		ast_update_use_count();
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *lintog723_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_SLINEAR;
-+	f.datalen = sizeof(slin_g723_ex);
-+	/* Assume 8000 Hz */
-+	f.samples = sizeof(slin_g723_ex)/16;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = slin_g723_ex;
-+	return &f;
-+}
-+
-+static struct ast_frame *g723tolin_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_G723_1;
-+	f.datalen = sizeof(g723_slin_ex);
-+	/* All frames are 30 ms long */
-+	f.samples = 30;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = g723_slin_ex;
-+	return &f;
-+}
-+
-+static struct ast_translator_pvt *lintog723_new()
-+{
-+	struct g723_encoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g723_encoder_pvt));
-+	if (tmp) {
-+		localusecnt++;
-+		ast_update_use_count();
-+		tmp->tail = 0;
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *g723tolin_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt;
-+	if (!tmp->tail)
-+		return NULL;
-+	/* Signed linear is no particular frame size, so just send whatever
-+	   we have in the buffer in one lump sum */
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_SLINEAR;
-+	tmp->f.datalen = tmp->tail * 2;
-+	/* Assume 8000 Hz */
-+	tmp->f.samples = tmp->tail / 8;
-+	tmp->f.mallocd = 0;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.data = tmp->buf;
-+	/* Reset tail pointer */
-+	tmp->tail = 0;
-+
-+	return &tmp->f;	
-+}
-+
-+static int g723_len(unsigned char buf)
-+{
-+	switch(buf & TYPE_MASK) {
-+	case TYPE_DONTSEND:
-+		return 2;
-+		break;
-+	case TYPE_SILENCE:
-+		return 4;
-+		break;
-+	case TYPE_HIGH:
-+		return 24;
-+		break;
-+	case TYPE_LOW:
-+		return 20;
-+		break;
-+	default:
-+		ast_log(LOG_WARNING, "Badly encoded frame (%d)\n", buf & TYPE_MASK);
-+	}
-+	return -1;
-+}
-+
-+static int g723tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt;
-+	int len = 0;
-+	int res;
-+	while(len < f->datalen) {
-+		/* Assuming there's space left, decode into the current buffer at
-+		   the tail location */
-+		res = g723_len(((unsigned char *)f->data + len)[0]);
-+		if (res < 0) {
-+			ast_log(LOG_WARNING, "Invalid data\n");
-+			return -1;
-+		}
-+		if (res + len > f->datalen) {
-+			ast_log(LOG_WARNING, "Measured length exceeds frame length\n");
-+			return -1;
-+		}
-+		if (tmp->tail + 480 < sizeof(tmp->buf)/2) {	
-+			memset(tmp->buf + tmp->tail, 0, 480);
-+			tmp->tail+=480;
-+		} else {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return -1;
-+		}
-+		len += res;
-+	}
-+	return 0;
-+}
-+
-+static int lintog723_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	/* Just add the frames to our stream */
-+	/* XXX We should look at how old the rest of our stream is, and if it
-+	   is too old, then we should overwrite it entirely, otherwise we can
-+	   get artifacts of earlier talk that do not belong */
-+	struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt;
-+	if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) {
-+		memcpy(&tmp->buf[tmp->tail], f->data, f->datalen);
-+		tmp->tail += f->datalen/2;
-+	} else {
-+		ast_log(LOG_WARNING, "Out of buffer space\n");
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static struct ast_frame *lintog723_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt;
-+	int cnt=0;
-+	/* We can't work on anything less than a frame in size */
-+	if (tmp->tail < 480)
-+		return NULL;
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_G723_1;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.samples = 0;
-+	tmp->f.mallocd = 0;
-+	while(tmp->tail >= 480) {
-+		/* Encode a frame of data */
-+		if (cnt + 24 >= sizeof(tmp->outbuf)) {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return NULL;
-+		}
-+		memset(tmp->outbuf + cnt, 0, 24);
-+		/* Assume 8000 Hz */
-+		tmp->f.samples += 30;
-+		cnt += 24;
-+		tmp->tail -= 480;
-+		/* Move the data at the end of the buffer to the front */
-+		if (tmp->tail)
-+			memmove(tmp->buf, tmp->buf + 480, tmp->tail * 2);
-+	}
-+	tmp->f.datalen = cnt;
-+	tmp->f.data = tmp->outbuf;
-+	return &tmp->f;	
-+}
-+
-+static void g723_destroy(struct ast_translator_pvt *pvt)
-+{
-+	free(pvt);
-+	localusecnt--;
-+	ast_update_use_count();
-+}
-+
-+static struct ast_translator g723tolin =
-+	{ "g723tolin_dummy", 
-+	   AST_FORMAT_G723_1, AST_FORMAT_SLINEAR,
-+	   g723tolin_new,
-+	   g723tolin_framein,
-+	   g723tolin_frameout,
-+	   g723_destroy,
-+	   g723tolin_sample
-+	   };
-+
-+static struct ast_translator lintog723 =
-+	{ "lintog723_dummy", 
-+	   AST_FORMAT_SLINEAR, AST_FORMAT_G723_1,
-+	   lintog723_new,
-+	   lintog723_framein,
-+	   lintog723_frameout,
-+	   g723_destroy,
-+	   lintog723_sample
-+	   };
-+
-+int unload_module(void)
-+{
-+	int res;
-+	ast_mutex_lock(&localuser_lock);
-+	res = ast_unregister_translator(&lintog723);
-+	if (!res)
-+		res = ast_unregister_translator(&g723tolin);
-+	if (localusecnt)
-+		res = -1;
-+	ast_mutex_unlock(&localuser_lock);
-+	return res;
-+}
-+
-+int load_module(void)
-+{
-+	int res;
-+	res=ast_register_translator(&g723tolin);
-+	if (!res) 
-+		res=ast_register_translator(&lintog723);
-+	else
-+		ast_unregister_translator(&g723tolin);
-+	return res;
-+}
-+
-+char *description(void)
-+{
-+	return tdesc;
-+}
-+
-+int usecount(void)
-+{
-+	int res;
-+	STANDARD_USECOUNT(res);
-+	return res;
-+}
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk-bristuff/files/patch-codecs::codec_g729_dummy.c b/net/asterisk-bristuff/files/patch-codecs::codec_g729_dummy.c
deleted file mode 100644
index c3e27d98e27e..000000000000
--- a/net/asterisk-bristuff/files/patch-codecs::codec_g729_dummy.c
+++ /dev/null
@@ -1,281 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g729_dummy.c	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,275 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Translate between signed linear and G.729 (dummy!)
-+ *
-+ * The G.729 code is not included in the Asterisk distribution because
-+ * it is covered with patents, and in spite of statements to the contrary,
-+ * the "technology" is extremely expensive to license.
-+ * 
-+ * Copyright (C) 1999, Mark Spencer
-+ *
-+ * Mark Spencer <markster@linux-support.net>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#include <sys/types.h>
-+#include <asterisk/translate.h>
-+#include <asterisk/module.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/channel.h>
-+#include <pthread.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <netinet/in.h>
-+#include <string.h>
-+#include <stdio.h>
-+
-+/* Sample frame data */
-+#include "slin_g729_ex.h"
-+#include "g729_slin_ex.h"
-+
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
-+static int localusecnt=0;
-+
-+static char *tdesc = "Dummy G.729/PCM16 Codec Translator";
-+
-+struct g729_encoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Buffer for our outgoing frame */
-+	char outbuf[8000];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+struct g729_decoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+static struct ast_translator_pvt *g729tolin_new()
-+{
-+	struct g729_decoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g729_decoder_pvt));
-+	if (tmp) {
-+		tmp->tail = 0;
-+		localusecnt++;
-+		ast_update_use_count();
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *lintog729_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_SLINEAR;
-+	f.datalen = sizeof(slin_g729_ex);
-+	/* Assume 8000 Hz */
-+	f.samples = sizeof(slin_g729_ex)/16;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = slin_g729_ex;
-+	return &f;
-+}
-+
-+static struct ast_frame *g729tolin_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_G729A;
-+	f.datalen = sizeof(g729_slin_ex);
-+	/* All frames are 10 ms long */
-+	f.samples = 10;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = g729_slin_ex;
-+	return &f;
-+}
-+
-+static struct ast_translator_pvt *lintog729_new()
-+{
-+	struct g729_encoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g729_encoder_pvt));
-+	if (tmp) {
-+		localusecnt++;
-+		ast_update_use_count();
-+		tmp->tail = 0;
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *g729tolin_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt;
-+	if (!tmp->tail)
-+		return NULL;
-+	/* Signed linear is no particular frame size, so just send whatever
-+	   we have in the buffer in one lump sum */
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_SLINEAR;
-+	tmp->f.datalen = tmp->tail * 2;
-+	/* Assume 8000 Hz */
-+	tmp->f.samples = tmp->tail / 8;
-+	tmp->f.mallocd = 0;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.data = tmp->buf;
-+	/* Reset tail pointer */
-+	tmp->tail = 0;
-+
-+	return &tmp->f;	
-+}
-+
-+static int g729tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt;
-+	int len = 0;
-+	while(len < f->datalen) {
-+		/* Assuming there's space left, decode into the current buffer at
-+		   the tail location */
-+		if (10 + len > f->datalen) {
-+			ast_log(LOG_WARNING, "Measured length exceeds frame length\n");
-+			return -1;
-+		}
-+		if (tmp->tail + 160 < sizeof(tmp->buf)/2) {	
-+			memset(tmp->buf + tmp->tail, 0, 160);
-+			tmp->tail+=160;
-+		} else {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return -1;
-+		}
-+		len += 10;
-+	}
-+	return 0;
-+}
-+
-+static int lintog729_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	/* Just add the frames to our stream */
-+	/* XXX We should look at how old the rest of our stream is, and if it
-+	   is too old, then we should overwrite it entirely, otherwise we can
-+	   get artifacts of earlier talk that do not belong */
-+	struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt;
-+	if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) {
-+		memcpy(&tmp->buf[tmp->tail], f->data, f->datalen);
-+		tmp->tail += f->datalen/2;
-+	} else {
-+		ast_log(LOG_WARNING, "Out of buffer space\n");
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static struct ast_frame *lintog729_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt;
-+	int cnt=0;
-+	/* We can't work on anything less than a frame in size */
-+	if (tmp->tail < 160)
-+		return NULL;
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_G729A;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.samples = 0;
-+	tmp->f.mallocd = 0;
-+	while(tmp->tail >= 160) {
-+		/* Encode a frame of data */
-+		if (cnt + 10 >= sizeof(tmp->outbuf)) {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return NULL;
-+		}
-+		memset(tmp->outbuf + cnt, 0, 10);
-+		/* Assume 8000 Hz */
-+		tmp->f.samples += 10;
-+		cnt += 10;
-+		tmp->tail -= 160;
-+		/* Move the data at the end of the buffer to the front */
-+		if (tmp->tail)
-+			memmove(tmp->buf, tmp->buf + 160, tmp->tail * 2);
-+	}
-+	tmp->f.datalen = cnt;
-+	tmp->f.data = tmp->outbuf;
-+	return &tmp->f;	
-+}
-+
-+static void g729_destroy(struct ast_translator_pvt *pvt)
-+{
-+	free(pvt);
-+	localusecnt--;
-+	ast_update_use_count();
-+}
-+
-+static struct ast_translator g729tolin =
-+	{ "g729tolin_dummy", 
-+	   AST_FORMAT_G729A, AST_FORMAT_SLINEAR,
-+	   g729tolin_new,
-+	   g729tolin_framein,
-+	   g729tolin_frameout,
-+	   g729_destroy,
-+	   g729tolin_sample
-+	   };
-+
-+static struct ast_translator lintog729 =
-+	{ "lintog729_dummy", 
-+	   AST_FORMAT_SLINEAR, AST_FORMAT_G729A,
-+	   lintog729_new,
-+	   lintog729_framein,
-+	   lintog729_frameout,
-+	   g729_destroy,
-+	   lintog729_sample
-+	   };
-+
-+int unload_module(void)
-+{
-+	int res;
-+	ast_mutex_lock(&localuser_lock);
-+	res = ast_unregister_translator(&lintog729);
-+	if (!res)
-+		res = ast_unregister_translator(&g729tolin);
-+	if (localusecnt)
-+		res = -1;
-+	ast_mutex_unlock(&localuser_lock);
-+	return res;
-+}
-+
-+int load_module(void)
-+{
-+	int res;
-+	res=ast_register_translator(&g729tolin);
-+	if (!res) 
-+		res=ast_register_translator(&lintog729);
-+	else
-+		ast_unregister_translator(&g729tolin);
-+	return res;
-+}
-+
-+char *description(void)
-+{
-+	return tdesc;
-+}
-+
-+int usecount(void)
-+{
-+	int res;
-+	STANDARD_USECOUNT(res);
-+	return res;
-+}
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk-bristuff/files/patch-codecs::g729_slin_ex.h b/net/asterisk-bristuff/files/patch-codecs::g729_slin_ex.h
deleted file mode 100644
index 44e60f2de848..000000000000
--- a/net/asterisk-bristuff/files/patch-codecs::g729_slin_ex.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/g729_slin_ex.h	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,14 @@
-+/*
-+ * g729_slin_ex.h --
-+ *
-+ *      8-bit G.729 data, 10 milliseconds worth at 8 kHz.
-+ *
-+ * Copyright (C) 2004, Maxim Sobolev <sobomax@FreeBSD.org>
-+ *
-+ * Distributed under the terms of the GNU General Public License
-+ *
-+ */
-+
-+static unsigned char g729_slin_ex[] = {
-+120,82,175,64,0,250,219,0,7,214
-+};
diff --git a/net/asterisk-bristuff/files/patch-codecs::gsm::Makefile b/net/asterisk-bristuff/files/patch-codecs::gsm::Makefile
deleted file mode 100644
index d60ed11f3298..000000000000
--- a/net/asterisk-bristuff/files/patch-codecs::gsm::Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- codecs/gsm/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/gsm/Makefile	Fri Jan 30 01:47:34 2004
-@@ -60,8 +60,8 @@
- # CC		= /usr/lang/acc
- # CCFLAGS 	= -c -O
- 
--CC		= gcc $(OPTIMIZE) -fomit-frame-pointer 
--CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
-+CC		?= gcc
-+CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer
- 
- LD 		= $(CC)
- 
-@@ -146,7 +146,7 @@
- DEBUG	= -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
- 
--CFLAGS	= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
-+CFLAGS	+= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
- 	$(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC)
- ######### It's $(CC) $(CFLAGS)
- 
diff --git a/net/asterisk-bristuff/files/patch-codecs::ilbc::Makefile b/net/asterisk-bristuff/files/patch-codecs::ilbc::Makefile
deleted file mode 100644
index 7770e07550a4..000000000000
--- a/net/asterisk-bristuff/files/patch-codecs::ilbc::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-
-$FreeBSD$
-
---- codecs/ilbc/Makefile.orig	Sun Apr 27 21:13:11 2003
-+++ codecs/ilbc/Makefile	Fri Jan 30 01:47:34 2004
-@@ -1,4 +1,4 @@
--CFLAGS+= -fPIC -O3
-+CFLAGS+= -fPIC
- LIB=libilbc.a
- 
- OBJS= anaFilter.o iCBSearch.o packing.o \
diff --git a/net/asterisk-bristuff/files/patch-codecs::lpc10::Makefile b/net/asterisk-bristuff/files/patch-codecs::lpc10::Makefile
deleted file mode 100644
index 68c98c064f70..000000000000
--- a/net/asterisk-bristuff/files/patch-codecs::lpc10::Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD$
-
---- codecs/lpc10/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/lpc10/Makefile	Fri Jan 30 02:06:54 2004
-@@ -3,7 +3,7 @@
- # 
- 
- # default C compiler
--CC= gcc
-+CC?= gcc
- 
- # 
- # These definitions for CFLAGS and LIB_TARGET_DIR are used when one
-@@ -22,14 +22,14 @@
- # 
- 
- WARNINGS = -Wall -Wno-comment -Wno-error
--CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
-+CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
- #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
- 
- #fix for PPC processors
- ifneq ($(OSARCH),Darwin)
- ifneq ($(PROC),ppc)
- ifneq ($(PROC),x86_64)
--	CFLAGS+= -march=$(PROC)
-+	CFLAGS+= 
- endif
- endif
- endif
diff --git a/net/asterisk-bristuff/files/patch-codecs::slin_g729_ex.h b/net/asterisk-bristuff/files/patch-codecs::slin_g729_ex.h
deleted file mode 100644
index e1236d2498dc..000000000000
--- a/net/asterisk-bristuff/files/patch-codecs::slin_g729_ex.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/slin_g729_ex.h	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,25 @@
-+/*
-+ * slin_g729_ex.h --
-+ *
-+ *	Signed 16-bit audio data, 10 milliseconds worth at 8 kHz.
-+ *
-+ * Source: g723.example
-+ *
-+ * Copyright (C) 2001, Linux Support Services, Inc.
-+ *
-+ * Distributed under the terms of the GNU General Public License
-+ *
-+ */
-+
-+static signed short slin_g729_ex[] = {
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
-+};
diff --git a/net/asterisk-bristuff/files/patch-db.c b/net/asterisk-bristuff/files/patch-db.c
deleted file mode 100644
index 59e5cef87770..000000000000
--- a/net/asterisk-bristuff/files/patch-db.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- db.c.orig	Tue Dec  2 17:12:56 2003
-+++ db.c	Fri Jan 30 01:47:34 2004
-@@ -32,7 +32,7 @@
- #include <asterisk/options.h>
- #include <asterisk/astdb.h>
- #include <asterisk/cli.h>
--#include "db1-ast/include/db.h"
-+#include <db.h>
- #include "asterisk.h"
- #include "astconf.h"
- 
diff --git a/net/asterisk-bristuff/files/patch-editline::configure b/net/asterisk-bristuff/files/patch-editline::configure
deleted file mode 100644
index f6b9c5b76eee..000000000000
--- a/net/asterisk-bristuff/files/patch-editline::configure
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- editline/configure.orig	Sun Apr 27 21:13:11 2003
-+++ editline/configure	Fri Jan 30 01:47:34 2004
-@@ -1906,7 +1906,7 @@
-   CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG"
-   CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE"
- else
--  CFLAGS="$CFLAGS -O"
-+  CFLAGS="$CFLAGS"
- fi
- 
- 
diff --git a/net/asterisk-bristuff/files/patch-formats::Makefile b/net/asterisk-bristuff/files/patch-formats::Makefile
deleted file mode 100644
index dacfd7b08303..000000000000
--- a/net/asterisk-bristuff/files/patch-formats::Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- formats/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ formats/Makefile	Fri Jan 30 01:47:34 2004
-@@ -18,7 +18,7 @@
- #
- # G723 simple frame is depricated
- #
--#FORMAT_LIBS+=format_g723.so
-+FORMAT_LIBS+=format_g723_1.so
- 
- GSMLIB=../codecs/gsm/lib/libgsm.a
- 
-@@ -40,7 +40,7 @@
- 	$(CC) $(SOLINK) -o $@ $< -lm
- 
- install: all
--	for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(FORMAT_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk-bristuff/files/patch-formats::format_g723_1.c b/net/asterisk-bristuff/files/patch-formats::format_g723_1.c
deleted file mode 100644
index 8d0755e14205..000000000000
--- a/net/asterisk-bristuff/files/patch-formats::format_g723_1.c
+++ /dev/null
@@ -1,351 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ formats/format_g723_1.c	Fri Jan 30 01:58:19 2004
-@@ -0,0 +1,345 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Save and read raw, headerless G723.1 Annex A data.
-+ *
-+ * Copyright (C) 1999, Mark Spencer <markster@linux-support.net>
-+ * Copyright (C) 2003, Maxim Sobolev <sobomax@FreeBSD.org>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#include <asterisk/lock.h>
-+#include <asterisk/channel.h>
-+#include <asterisk/file.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/sched.h>
-+#include <asterisk/module.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <stdlib.h>
-+#include <sys/time.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#include <string.h>
-+#include <pthread.h>
-+#ifdef __linux__
-+#include <endian.h>
-+#else
-+#include <machine/endian.h>
-+#endif
-+
-+/* Based on format_g729.c */
-+
-+#define TYPE_HIGH	0x0
-+#define TYPE_LOW	0x1
-+#define TYPE_SILENCE	0x2
-+#define TYPE_DONTSEND	0x3
-+#define TYPE_MASK	0x3
-+
-+struct ast_filestream {
-+	void *reserved[AST_RESERVED_POINTERS];
-+	/* This is what a filestream means to us */
-+	int fd; 				/* Descriptor */
-+	struct ast_frame fr;			/* Frame information */
-+	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
-+	char empty;				/* Empty character */
-+	unsigned char g723[24];			/* One Real G723.1 Frame */
-+};
-+
-+static long g723_tell(struct ast_filestream *);
-+
-+static ast_mutex_t g723_lock = AST_MUTEX_INITIALIZER;
-+static int glistcnt = 0;
-+
-+static char *name = "g723";
-+static char *desc = "Raw G723.1 Annex A data";
-+static char *exts = "g723";
-+
-+static int g723_len(unsigned char buf)
-+{
-+	switch(buf & TYPE_MASK) {
-+	case TYPE_DONTSEND:
-+		return 2;
-+		break;
-+	case TYPE_SILENCE:
-+		return 4;
-+		break;
-+	case TYPE_HIGH:
-+		return 24;
-+		break;
-+	case TYPE_LOW:
-+		return 20;
-+		break;
-+	default:
-+		ast_log(LOG_WARNING, "Badly encoded G723.1 frame (%d)\n", buf & TYPE_MASK);
-+	}
-+	return -1;
-+}
-+
-+static struct ast_filestream *g723_open(int fd)
-+{
-+	/* We don't have any header to read or anything really, but
-+	   if we did, it would go here.  We also might want to check
-+	   and be sure it's a valid file.  */
-+	struct ast_filestream *tmp;
-+	if ((tmp = malloc(sizeof(struct ast_filestream)))) {
-+		memset(tmp, 0, sizeof(struct ast_filestream));
-+		if (ast_mutex_lock(&g723_lock)) {
-+			ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+			free(tmp);
-+			return NULL;
-+		}
-+		tmp->fd = fd;
-+		tmp->fr.data = tmp->g723;
-+		tmp->fr.frametype = AST_FRAME_VOICE;
-+		tmp->fr.subclass = AST_FORMAT_G723_1;
-+		/* datalen will vary for each frame */
-+		tmp->fr.src = name;
-+		tmp->fr.mallocd = 0;
-+		glistcnt++;
-+		ast_mutex_unlock(&g723_lock);
-+		ast_update_use_count();
-+	}
-+	return tmp;
-+}
-+
-+static struct ast_filestream *g723_rewrite(int fd, char *comment)
-+{
-+	/* We don't have any header to read or anything really, but
-+	   if we did, it would go here.  We also might want to check
-+	   and be sure it's a valid file.  */
-+	struct ast_filestream *tmp;
-+	if ((tmp = malloc(sizeof(struct ast_filestream)))) {
-+		memset(tmp, 0, sizeof(struct ast_filestream));
-+		if (ast_mutex_lock(&g723_lock)) {
-+			ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+			free(tmp);
-+			return NULL;
-+		}
-+		tmp->fd = fd;
-+		glistcnt++;
-+		ast_mutex_unlock(&g723_lock);
-+		ast_update_use_count();
-+	} else
-+		ast_log(LOG_WARNING, "Out of memory\n");
-+	return tmp;
-+}
-+
-+static void g723_close(struct ast_filestream *s)
-+{
-+	if (ast_mutex_lock(&g723_lock)) {
-+		ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+		return;
-+	}
-+	glistcnt--;
-+	ast_mutex_unlock(&g723_lock);
-+	ast_update_use_count();
-+	close(s->fd);
-+	free(s);
-+	s = NULL;
-+}
-+
-+static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext)
-+{
-+	int res;
-+	/* Send a frame from the file to the appropriate channel */
-+	s->fr.frametype = AST_FRAME_VOICE;
-+	s->fr.subclass = AST_FORMAT_G723_1;
-+	s->fr.offset = AST_FRIENDLY_OFFSET;
-+	s->fr.samples = 240;
-+	s->fr.mallocd = 0;
-+	s->fr.data = s->g723;
-+	if ((res = read(s->fd, s->g723, 1)) != 1) {
-+		if (res)
-+			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
-+		return NULL;
-+	}
-+	s->fr.datalen = g723_len(s->g723[0]);
-+	if (s->fr.datalen < 0) {
-+		ast_log(LOG_WARNING, "Invalid G723.1 frame!\n");
-+		return NULL;
-+	}
-+	if (s->fr.datalen > 1 && (res = read(s->fd, s->g723 + 1, s->fr.datalen - 1)) != s->fr.datalen - 1) {
-+		if (res)
-+			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
-+		return NULL;
-+	}
-+	*whennext = s->fr.samples;
-+	return &s->fr;
-+}
-+
-+static int g723_write(struct ast_filestream *fs, struct ast_frame *f)
-+{
-+	int res;
-+	unsigned char *cp;
-+	if (f->frametype != AST_FRAME_VOICE) {
-+		ast_log(LOG_WARNING, "Asked to write non-voice frame!\n");
-+		return -1;
-+	}
-+	if (f->subclass != AST_FORMAT_G723_1) {
-+		ast_log(LOG_WARNING, "Asked to write non-G723.1 frame (%d)!\n", f->subclass);
-+		return -1;
-+	}
-+	for (cp = f->data; cp < (unsigned char *)f->data + f->datalen; cp += res) {
-+		res = g723_len(cp[0]);
-+		if (res < 0) {
-+			ast_log(LOG_WARNING, "Asked to write invalid G723.1 frame!\n");
-+			return -1;
-+		}
-+	}
-+	if (cp != (unsigned char *)f->data + f->datalen) {
-+		ast_log(LOG_WARNING, "Invalid G723.1 data length, %d\n", f->datalen);
-+		return -1;
-+	}
-+	if ((res = write(fs->fd, f->data, f->datalen)) != f->datalen) {
-+		ast_log(LOG_WARNING, "Bad write %d: %s\n", res, strerror(errno));
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static char *g723_getcomment(struct ast_filestream *s)
-+{
-+	return NULL;
-+}
-+
-+static int g723_seek(struct ast_filestream *fs, long sample_offset, int whence)
-+{
-+	long cur, offset, max;
-+	off_t coffset, moffset, soffset;
-+	int res;
-+	unsigned char c;
-+
-+	offset = 0;	/* Shut up gcc warning */
-+	if (whence == SEEK_SET) {
-+		offset = sample_offset;
-+	} else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) {
-+		if ((cur = g723_tell(fs)) == -1) {
-+			ast_log(LOG_WARNING, "Can't get current position!\n");
-+			return -1;
-+		}
-+		offset = cur + sample_offset;
-+	}
-+	if ((moffset = lseek(fs->fd, 0, SEEK_END)) == -1) {
-+		ast_log(LOG_WARNING, "Can't seek stream to an end!\n");
-+		return -1;
-+	}
-+	if (whence == SEEK_END) {
-+		if ((max = g723_tell(fs)) == -1) {
-+			ast_log(LOG_WARNING, "Can't get maximum position!\n");
-+			return -1;
-+		}
-+		offset = max - sample_offset;
-+	}
-+	if (offset < 0)
-+		offset = 0;
-+	soffset = -1;
-+	for (coffset = 0; coffset < moffset && offset > 0; coffset += res) {
-+		if (lseek(fs->fd, coffset, SEEK_SET) != coffset) {
-+			ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		if (read(fs->fd, &c, 1) != 1) {
-+			ast_log(LOG_WARNING, "Can't read from offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		soffset = coffset;
-+		if ((res = g723_len(c)) < 0) {
-+			ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		if (res > 1)
-+			offset -= 240;
-+	}
-+	if (soffset != -1 && lseek(fs->fd, soffset, SEEK_SET) != soffset) {
-+		ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", soffset);
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+static int g723_trunc(struct ast_filestream *fs)
-+{
-+	/* Truncate file to current length */
-+	if (ftruncate(fs->fd, lseek(fs->fd, 0, SEEK_CUR)) < 0)
-+		return -1;
-+	return 0;
-+}
-+
-+static long g723_tell(struct ast_filestream *fs)
-+{
-+	off_t offset, coffset;
-+	int res;
-+	long rval;
-+	unsigned char c;
-+
-+	offset = lseek(fs->fd, 0, SEEK_CUR);
-+	rval = 0;
-+	for (coffset = 0; coffset < offset; coffset += res) {
-+		if (lseek(fs->fd, coffset, SEEK_SET) != coffset) {
-+			ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if (read(fs->fd, &c, 1) != 1) {
-+			ast_log(LOG_WARNING, "Can't read from offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if ((res = g723_len(c)) < 0) {
-+			ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if (res > 1)
-+			rval += 240;
-+	}
-+	if (lseek(fs->fd, offset, SEEK_SET) != offset) {
-+		ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", offset);
-+		return -1;
-+	}
-+	return rval;
-+}
-+
-+int load_module()
-+{
-+	return ast_format_register(name, exts, AST_FORMAT_G723_1,
-+				   g723_open,
-+				   g723_rewrite,
-+				   g723_write,
-+				   g723_seek,
-+				   g723_trunc,
-+				   g723_tell,
-+				   g723_read,
-+				   g723_close,
-+				   g723_getcomment);
-+}
-+
-+int unload_module()
-+{
-+	return ast_format_unregister(name);
-+}
-+
-+int usecount()
-+{
-+	int res;
-+	if (ast_mutex_lock(&g723_lock)) {
-+		ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+		return -1;
-+	}
-+	res = glistcnt;
-+	ast_mutex_unlock(&g723_lock);
-+	return res;
-+}
-+
-+char *description()
-+{
-+	return desc;
-+}
-+
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk-bristuff/files/patch-formats::format_g729.c b/net/asterisk-bristuff/files/patch-formats::format_g729.c
deleted file mode 100644
index a144d1b0f6bf..000000000000
--- a/net/asterisk-bristuff/files/patch-formats::format_g729.c
+++ /dev/null
@@ -1,47 +0,0 @@
-
-$FreeBSD$
-
---- formats/format_g729.c.orig	Wed Jan 28 23:32:48 2004
-+++ formats/format_g729.c	Thu Feb 19 01:03:30 2004
-@@ -45,7 +45,7 @@
- 	struct ast_frame fr;				/* Frame information */
- 	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
- 	char empty;							/* Empty character */
--	unsigned char g729[20];				/* Two Real G729 Frames */
-+	unsigned char g729[10];				/* One Real G729 Frame */
- };
- 
- 
-@@ -126,11 +126,11 @@
- 	s->fr.frametype = AST_FRAME_VOICE;
- 	s->fr.subclass = AST_FORMAT_G729A;
- 	s->fr.offset = AST_FRIENDLY_OFFSET;
--	s->fr.samples = 160;
--	s->fr.datalen = 20;
-+	s->fr.samples = 80;
-+	s->fr.datalen = 10;
- 	s->fr.mallocd = 0;
- 	s->fr.data = s->g729;
--	if ((res = read(s->fd, s->g729, 20)) != 20) {
-+	if ((res = read(s->fd, s->g729, 10)) != 10) {
- 		if (res)
- 			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
- 		return NULL;
-@@ -174,7 +174,7 @@
- 	cur = lseek(fs->fd, 0, SEEK_CUR);
- 	max = lseek(fs->fd, 0, SEEK_END);
- 	
--	bytes = 20 * (sample_offset / 160);
-+	bytes = 10 * (sample_offset / 80);
- 	if (whence == SEEK_SET)
- 		offset = bytes;
- 	else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
-@@ -202,7 +202,7 @@
- {
- 	off_t offset;
- 	offset = lseek(fs->fd, 0, SEEK_CUR);
--	return (offset/20)*160;
-+	return (offset/10)*80;
- }
- 
- int load_module()
diff --git a/net/asterisk-bristuff/files/patch-pbx::Makefile b/net/asterisk-bristuff/files/patch-pbx::Makefile
deleted file mode 100644
index dca6672c389a..000000000000
--- a/net/asterisk-bristuff/files/patch-pbx::Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- pbx/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ pbx/Makefile	Fri Jan 30 01:47:34 2004
-@@ -16,7 +16,7 @@
- PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so     # pbx_gtkconsole.so pbx_kdeconsole.so
- 
- # Add GTK console if appropriate
--PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
-+#PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
- # Add KDE Console if appropriate
- #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so")
- 
-@@ -62,7 +62,7 @@
- endif
- 
- install: all
--	for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(PBX_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk-bristuff/files/patch-res::Makefile b/net/asterisk-bristuff/files/patch-res::Makefile
deleted file mode 100644
index ccd0a35dd59d..000000000000
--- a/net/asterisk-bristuff/files/patch-res::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- res/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ res/Makefile	Fri Jan 30 01:47:34 2004
-@@ -25,7 +25,7 @@
- all: depend $(MODS)
- 
- install: all
--	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- res_crypto.so: res_crypto.o
- 	$(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS)
diff --git a/net/asterisk-bristuff/pkg-descr b/net/asterisk-bristuff/pkg-descr
deleted file mode 100644
index 28b7a1deb011..000000000000
--- a/net/asterisk-bristuff/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
-sense, middleware between Internet and telephony channels on the bottom,
-and Internet and telephony applications at the top.
-
-WWW: http://www.asteriskpbx.com
diff --git a/net/asterisk-bristuff/pkg-plist b/net/asterisk-bristuff/pkg-plist
deleted file mode 100644
index ab3eff23ff6e..000000000000
--- a/net/asterisk-bristuff/pkg-plist
+++ /dev/null
@@ -1,462 +0,0 @@
-@unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi
-etc/asterisk/adsi.conf-dist
-@exec [ -f %B/adsi.conf ] || cp %B/%f %B/adsi.conf
-@unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi
-etc/asterisk/adtranvofr.conf-dist
-@exec [ -f %B/adtranvofr.conf ] || cp %B/%f %B/adtranvofr.conf
-@unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi
-etc/asterisk/agents.conf-dist
-@exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf
-@unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi
-etc/asterisk/alsa.conf-dist
-@exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf
-@unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi
-etc/asterisk/asterisk.adsi-dist
-@exec [ -f %B/asterisk.adsi ] || cp %B/%f %B/asterisk.adsi
-@unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi
-etc/asterisk/asterisk.conf-dist
-@exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf
-@unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi
-etc/asterisk/cdr_odbc.conf-dist
-@exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf
-@unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi
-etc/asterisk/cdr_pgsql.conf-dist
-@exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf
-@unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi
-etc/asterisk/enum.conf-dist
-@exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf
-@unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi
-etc/asterisk/extensions.conf-dist
-@exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf
-@unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
-etc/asterisk/festival.conf-dist
-@exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
-@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
-etc/asterisk/h323.conf-dist
-@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.conf
-@unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
-etc/asterisk/iax.conf-dist
-@exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
-@unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi
-etc/asterisk/indications.conf-dist
-@exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf
-@unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi
-etc/asterisk/logger.conf-dist
-@exec [ -f %B/logger.conf ] || cp %B/%f %B/logger.conf
-@unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi
-etc/asterisk/manager.conf-dist
-@exec [ -f %B/manager.conf ] || cp %B/%f %B/manager.conf
-@unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi
-etc/asterisk/meetme.conf-dist
-@exec [ -f %B/meetme.conf ] || cp %B/%f %B/meetme.conf
-@unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi
-etc/asterisk/mgcp.conf-dist
-@exec [ -f %B/mgcp.conf ] || cp %B/%f %B/mgcp.conf
-@unexec if cmp -s %D/etc/asterisk/modem.conf %D/etc/asterisk/modem.conf-dist; then rm -f %D/etc/asterisk/modem.conf; fi
-etc/asterisk/modem.conf-dist
-@exec [ -f %B/modem.conf ] || cp %B/%f %B/modem.conf
-@unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi
-etc/asterisk/modules.conf-dist
-@exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf
-@unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi
-etc/asterisk/musiconhold.conf-dist
-@exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf
-@unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi
-etc/asterisk/oss.conf-dist
-@exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf
-@unexec if cmp -s %D/etc/asterisk/parking.conf %D/etc/asterisk/parking.conf-dist; then rm -f %D/etc/asterisk/parking.conf; fi
-etc/asterisk/parking.conf-dist
-@exec [ -f %B/parking.conf ] || cp %B/%f %B/parking.conf
-@unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi
-etc/asterisk/phone.conf-dist
-@exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf
-@unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi
-etc/asterisk/privacy.conf-dist
-@exec [ -f %B/privacy.conf ] || cp %B/%f %B/privacy.conf
-@unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi
-etc/asterisk/queues.conf-dist
-@exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf
-@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi
-etc/asterisk/rpt.conf-dist
-@exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf
-@unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi
-etc/asterisk/rtp.conf-dist
-@exec [ -f %B/rtp.conf ] || cp %B/%f %B/rtp.conf
-@unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi
-etc/asterisk/sip.conf-dist
-@exec [ -f %B/sip.conf ] || cp %B/%f %B/sip.conf
-@unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi
-etc/asterisk/skinny.conf-dist
-@exec [ -f %B/skinny.conf ] || cp %B/%f %B/skinny.conf
-@unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi
-etc/asterisk/telcordia-1.adsi-dist
-@exec [ -f %B/telcordia-1.adsi ] || cp %B/%f %B/telcordia-1.adsi
-@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi
-etc/asterisk/voicemail.conf-dist
-@exec [ -f %B/voicemail.conf ] || cp %B/%f %B/voicemail.conf
-@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi
-etc/asterisk/vpb.conf-dist
-@exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf
-@unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi
-etc/asterisk/zapata.conf-dist
-@exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf
-include/asterisk/acl.h
-include/asterisk/adsi.h
-include/asterisk/aes.h
-include/asterisk/alaw.h
-include/asterisk/app.h
-include/asterisk/ast_expr.h
-include/asterisk/astdb.h
-include/asterisk/astmm.h
-include/asterisk/callerid.h
-include/asterisk/causes.h
-include/asterisk/cdr.h
-include/asterisk/channel.h
-include/asterisk/channel_pvt.h
-include/asterisk/chanvars.h
-include/asterisk/cli.h
-include/asterisk/config.h
-include/asterisk/crypto.h
-include/asterisk/cvsid.h
-include/asterisk/dlfcn-compat.h
-include/asterisk/dns.h
-include/asterisk/dsp.h
-include/asterisk/enum.h
-include/asterisk/file.h
-include/asterisk/frame.h
-include/asterisk/fskmodem.h
-include/asterisk/image.h
-include/asterisk/indications.h
-include/asterisk/io.h
-include/asterisk/linkedlists.h
-include/asterisk/localtime.h
-include/asterisk/lock.h
-include/asterisk/logger.h
-include/asterisk/manager.h
-include/asterisk/md5.h
-include/asterisk/module.h
-include/asterisk/monitor.h
-include/asterisk/musiconhold.h
-include/asterisk/options.h
-include/asterisk/parking.h
-include/asterisk/pbx.h
-include/asterisk/poll-compat.h
-include/asterisk/privacy.h
-include/asterisk/rtp.h
-include/asterisk/say.h
-include/asterisk/sched.h
-include/asterisk/srv.h
-include/asterisk/tdd.h
-include/asterisk/term.h
-include/asterisk/translate.h
-include/asterisk/ulaw.h
-include/asterisk/vmodem.h
-lib/asterisk/modules/app_adsiprog.so
-lib/asterisk/modules/app_agi.so
-lib/asterisk/modules/app_authenticate.so
-lib/asterisk/modules/app_cdr.so
-lib/asterisk/modules/app_chanisavail.so
-lib/asterisk/modules/app_cut.so
-lib/asterisk/modules/app_datetime.so
-lib/asterisk/modules/app_db.so
-lib/asterisk/modules/app_dial.so
-lib/asterisk/modules/app_directory.so
-lib/asterisk/modules/app_disa.so
-lib/asterisk/modules/app_echo.so
-lib/asterisk/modules/app_enumlookup.so
-lib/asterisk/modules/app_festival.so
-lib/asterisk/modules/app_getcpeid.so
-lib/asterisk/modules/app_hasnewvoicemail.so
-lib/asterisk/modules/app_image.so
-lib/asterisk/modules/app_intercom.so
-lib/asterisk/modules/app_lookupblacklist.so
-lib/asterisk/modules/app_lookupcidname.so
-lib/asterisk/modules/app_macro.so
-lib/asterisk/modules/app_milliwatt.so
-lib/asterisk/modules/app_mp3.so
-lib/asterisk/modules/app_parkandannounce.so
-lib/asterisk/modules/app_playback.so
-lib/asterisk/modules/app_privacy.so
-lib/asterisk/modules/app_qcall.so
-lib/asterisk/modules/app_queue.so
-lib/asterisk/modules/app_random.so
-lib/asterisk/modules/app_read.so
-lib/asterisk/modules/app_record.so
-lib/asterisk/modules/app_sayunixtime.so
-lib/asterisk/modules/app_senddtmf.so
-lib/asterisk/modules/app_setcallerid.so
-lib/asterisk/modules/app_setcdruserfield.so
-lib/asterisk/modules/app_setcidname.so
-lib/asterisk/modules/app_setcidnum.so
-lib/asterisk/modules/app_softhangup.so
-lib/asterisk/modules/app_striplsd.so
-lib/asterisk/modules/app_substring.so
-lib/asterisk/modules/app_system.so
-lib/asterisk/modules/app_transfer.so
-lib/asterisk/modules/app_url.so
-lib/asterisk/modules/app_voicemail.so
-lib/asterisk/modules/app_waitforring.so
-lib/asterisk/modules/app_zapateller.so
-lib/asterisk/modules/cdr_csv.so
-lib/asterisk/modules/chan_agent.so
-lib/asterisk/modules/chan_h323.so
-lib/asterisk/modules/chan_iax.so
-lib/asterisk/modules/chan_iax2.so
-lib/asterisk/modules/chan_local.so
-lib/asterisk/modules/chan_mgcp.so
-lib/asterisk/modules/chan_modem.so
-lib/asterisk/modules/chan_modem_aopen.so
-lib/asterisk/modules/chan_modem_bestdata.so
-lib/asterisk/modules/chan_modem_i4l.so
-lib/asterisk/modules/chan_oss.so
-lib/asterisk/modules/chan_sip.so
-lib/asterisk/modules/chan_skinny.so
-lib/asterisk/modules/codec_a_mu.so
-lib/asterisk/modules/codec_adpcm.so
-lib/asterisk/modules/codec_alaw.so
-lib/asterisk/modules/codec_g723_1_dummy.so
-lib/asterisk/modules/codec_g729_dummy.so
-lib/asterisk/modules/codec_gsm.so
-lib/asterisk/modules/codec_ilbc.so
-lib/asterisk/modules/codec_lpc10.so
-lib/asterisk/modules/codec_speex.so
-lib/asterisk/modules/codec_ulaw.so
-lib/asterisk/modules/format_g723_1.so
-lib/asterisk/modules/format_g729.so
-lib/asterisk/modules/format_gsm.so
-lib/asterisk/modules/format_h263.so
-lib/asterisk/modules/format_jpeg.so
-lib/asterisk/modules/format_pcm.so
-lib/asterisk/modules/format_pcm_alaw.so
-lib/asterisk/modules/format_vox.so
-lib/asterisk/modules/format_wav.so
-lib/asterisk/modules/format_wav_gsm.so
-lib/asterisk/modules/pbx_config.so
-lib/asterisk/modules/pbx_spool.so
-lib/asterisk/modules/pbx_wilcalu.so
-lib/asterisk/modules/res_adsi.so
-lib/asterisk/modules/res_crypto.so
-lib/asterisk/modules/res_indications.so
-lib/asterisk/modules/res_monitor.so
-lib/asterisk/modules/res_musiconhold.so
-lib/asterisk/modules/res_parking.so
-sbin/asterisk
-sbin/astgenkey
-sbin/safe_asterisk
-share/asterisk/agi-bin/agi-test.agi
-share/asterisk/agi-bin/eagi-sphinx-test
-share/asterisk/agi-bin/eagi-test
-share/asterisk/images/asterisk-intro.jpg
-share/asterisk/keys/iaxtel.pub
-share/asterisk/mohmp3/sample-hold.mp3
-share/asterisk/sounds/agent-alreadyon.gsm
-share/asterisk/sounds/agent-incorrect.gsm
-share/asterisk/sounds/agent-loggedoff.gsm
-share/asterisk/sounds/agent-loginok.gsm
-share/asterisk/sounds/agent-newlocation.gsm
-share/asterisk/sounds/agent-pass.gsm
-share/asterisk/sounds/agent-user.gsm
-share/asterisk/sounds/auth-incorrect.gsm
-share/asterisk/sounds/auth-thankyou.gsm
-share/asterisk/sounds/beep.gsm
-share/asterisk/sounds/conf-getchannel.gsm
-share/asterisk/sounds/conf-getconfno.gsm
-share/asterisk/sounds/conf-getpin.gsm
-share/asterisk/sounds/conf-invalid.gsm
-share/asterisk/sounds/conf-invalidpin.gsm
-share/asterisk/sounds/conf-onlyperson.gsm
-share/asterisk/sounds/demo-abouttotry.gsm
-share/asterisk/sounds/demo-congrats.gsm
-share/asterisk/sounds/demo-echodone.gsm
-share/asterisk/sounds/demo-echotest.gsm
-share/asterisk/sounds/demo-enterkeywords.gsm
-share/asterisk/sounds/demo-instruct.gsm
-share/asterisk/sounds/demo-moreinfo.gsm
-share/asterisk/sounds/demo-nogo.gsm
-share/asterisk/sounds/demo-nomatch.gsm
-share/asterisk/sounds/demo-thanks.gsm
-share/asterisk/sounds/digits/0.gsm
-share/asterisk/sounds/digits/1.gsm
-share/asterisk/sounds/digits/10.gsm
-share/asterisk/sounds/digits/11.gsm
-share/asterisk/sounds/digits/12.gsm
-share/asterisk/sounds/digits/13.gsm
-share/asterisk/sounds/digits/14.gsm
-share/asterisk/sounds/digits/15.gsm
-share/asterisk/sounds/digits/16.gsm
-share/asterisk/sounds/digits/17.gsm
-share/asterisk/sounds/digits/18.gsm
-share/asterisk/sounds/digits/19.gsm
-share/asterisk/sounds/digits/2.gsm
-share/asterisk/sounds/digits/20.gsm
-share/asterisk/sounds/digits/3.gsm
-share/asterisk/sounds/digits/30.gsm
-share/asterisk/sounds/digits/4.gsm
-share/asterisk/sounds/digits/40.gsm
-share/asterisk/sounds/digits/5.gsm
-share/asterisk/sounds/digits/50.gsm
-share/asterisk/sounds/digits/6.gsm
-share/asterisk/sounds/digits/60.gsm
-share/asterisk/sounds/digits/7.gsm
-share/asterisk/sounds/digits/70.gsm
-share/asterisk/sounds/digits/8.gsm
-share/asterisk/sounds/digits/80.gsm
-share/asterisk/sounds/digits/9.gsm
-share/asterisk/sounds/digits/90.gsm
-share/asterisk/sounds/digits/a-m.gsm
-share/asterisk/sounds/digits/at.gsm
-share/asterisk/sounds/digits/day-0.gsm
-share/asterisk/sounds/digits/day-1.gsm
-share/asterisk/sounds/digits/day-2.gsm
-share/asterisk/sounds/digits/day-3.gsm
-share/asterisk/sounds/digits/day-4.gsm
-share/asterisk/sounds/digits/day-5.gsm
-share/asterisk/sounds/digits/day-6.gsm
-share/asterisk/sounds/digits/dollars.gsm
-share/asterisk/sounds/digits/h-1.gsm
-share/asterisk/sounds/digits/h-10.gsm
-share/asterisk/sounds/digits/h-11.gsm
-share/asterisk/sounds/digits/h-12.gsm
-share/asterisk/sounds/digits/h-13.gsm
-share/asterisk/sounds/digits/h-14.gsm
-share/asterisk/sounds/digits/h-15.gsm
-share/asterisk/sounds/digits/h-16.gsm
-share/asterisk/sounds/digits/h-17.gsm
-share/asterisk/sounds/digits/h-18.gsm
-share/asterisk/sounds/digits/h-19.gsm
-share/asterisk/sounds/digits/h-2.gsm
-share/asterisk/sounds/digits/h-20.gsm
-share/asterisk/sounds/digits/h-3.gsm
-share/asterisk/sounds/digits/h-30.gsm
-share/asterisk/sounds/digits/h-4.gsm
-share/asterisk/sounds/digits/h-5.gsm
-share/asterisk/sounds/digits/h-6.gsm
-share/asterisk/sounds/digits/h-7.gsm
-share/asterisk/sounds/digits/h-8.gsm
-share/asterisk/sounds/digits/h-9.gsm
-share/asterisk/sounds/digits/hundred.gsm
-share/asterisk/sounds/digits/million.gsm
-share/asterisk/sounds/digits/mon-0.gsm
-share/asterisk/sounds/digits/mon-1.gsm
-share/asterisk/sounds/digits/mon-10.gsm
-share/asterisk/sounds/digits/mon-11.gsm
-share/asterisk/sounds/digits/mon-2.gsm
-share/asterisk/sounds/digits/mon-3.gsm
-share/asterisk/sounds/digits/mon-4.gsm
-share/asterisk/sounds/digits/mon-5.gsm
-share/asterisk/sounds/digits/mon-6.gsm
-share/asterisk/sounds/digits/mon-7.gsm
-share/asterisk/sounds/digits/mon-8.gsm
-share/asterisk/sounds/digits/mon-9.gsm
-share/asterisk/sounds/digits/oclock.gsm
-share/asterisk/sounds/digits/oh.gsm
-share/asterisk/sounds/digits/p-m.gsm
-share/asterisk/sounds/digits/pound.gsm
-share/asterisk/sounds/digits/star.gsm
-share/asterisk/sounds/digits/thousand.gsm
-share/asterisk/sounds/digits/today.gsm
-share/asterisk/sounds/digits/tomorrow.gsm
-share/asterisk/sounds/digits/yesterday.gsm
-share/asterisk/sounds/dir-instr.gsm
-share/asterisk/sounds/dir-intro.gsm
-share/asterisk/sounds/dir-nomatch.gsm
-share/asterisk/sounds/dir-nomore.gsm
-share/asterisk/sounds/invalid.gsm
-share/asterisk/sounds/pbx-invalid.gsm
-share/asterisk/sounds/pbx-invalidpark.gsm
-share/asterisk/sounds/pbx-transfer.gsm
-share/asterisk/sounds/privacy-incorrect.gsm
-share/asterisk/sounds/privacy-prompt.gsm
-share/asterisk/sounds/privacy-thankyou.gsm
-share/asterisk/sounds/privacy-unident.gsm
-share/asterisk/sounds/ss-noservice.gsm
-share/asterisk/sounds/transfer.gsm
-share/asterisk/sounds/tt-allbusy.gsm
-share/asterisk/sounds/tt-monkeys.gsm
-share/asterisk/sounds/tt-monkeysintro.gsm
-share/asterisk/sounds/tt-somethingwrong.gsm
-share/asterisk/sounds/tt-weasels.gsm
-share/asterisk/sounds/vm
-share/asterisk/sounds/vm-Family.gsm
-share/asterisk/sounds/vm-Friends.gsm
-share/asterisk/sounds/vm-INBOX.gsm
-share/asterisk/sounds/vm-Old.gsm
-share/asterisk/sounds/vm-Work.gsm
-share/asterisk/sounds/vm-and.gsm
-share/asterisk/sounds/vm-changeto.gsm
-share/asterisk/sounds/vm-delete.gsm
-share/asterisk/sounds/vm-deleted.gsm
-share/asterisk/sounds/vm-extension.gsm
-share/asterisk/sounds/vm-first.gsm
-share/asterisk/sounds/vm-for.gsm
-share/asterisk/sounds/vm-forwardoptions.gsm
-share/asterisk/sounds/vm-goodbye.gsm
-share/asterisk/sounds/vm-helpexit.gsm
-share/asterisk/sounds/vm-incorrect.gsm
-share/asterisk/sounds/vm-instructions.gsm
-share/asterisk/sounds/vm-intro.gsm
-share/asterisk/sounds/vm-isonphone.gsm
-share/asterisk/sounds/vm-isunavail.gsm
-share/asterisk/sounds/vm-last.gsm
-share/asterisk/sounds/vm-login.gsm
-share/asterisk/sounds/vm-mailboxfull.gsm
-share/asterisk/sounds/vm-message.gsm
-share/asterisk/sounds/vm-messages.gsm
-share/asterisk/sounds/vm-mismatch.gsm
-share/asterisk/sounds/vm-msginstruct.gsm
-share/asterisk/sounds/vm-msgsaved.gsm
-share/asterisk/sounds/vm-newpassword.gsm
-share/asterisk/sounds/vm-next.gsm
-share/asterisk/sounds/vm-no.gsm
-share/asterisk/sounds/vm-nobodyavail.gsm
-share/asterisk/sounds/vm-nomore.gsm
-share/asterisk/sounds/vm-onefor.gsm
-share/asterisk/sounds/vm-options.gsm
-share/asterisk/sounds/vm-opts.gsm
-share/asterisk/sounds/vm-passchanged.gsm
-share/asterisk/sounds/vm-password.gsm
-share/asterisk/sounds/vm-press.gsm
-share/asterisk/sounds/vm-prev.gsm
-share/asterisk/sounds/vm-rec-busy.gsm
-share/asterisk/sounds/vm-rec-name.gsm
-share/asterisk/sounds/vm-rec-unv.gsm
-share/asterisk/sounds/vm-received.gsm
-share/asterisk/sounds/vm-reenterpassword.gsm
-share/asterisk/sounds/vm-repeat.gsm
-share/asterisk/sounds/vm-saved.gsm
-share/asterisk/sounds/vm-savedto.gsm
-share/asterisk/sounds/vm-savefolder.gsm
-share/asterisk/sounds/vm-savemessage.gsm
-share/asterisk/sounds/vm-sorry.gsm
-share/asterisk/sounds/vm-theperson.gsm
-share/asterisk/sounds/vm-tocancel.gsm
-share/asterisk/sounds/vm-toforward.gsm
-share/asterisk/sounds/vm-undelete.gsm
-share/asterisk/sounds/vm-undeleted.gsm
-share/asterisk/sounds/vm-whichbox.gsm
-share/asterisk/sounds/vm-youhave.gsm
-share/asterisk/sounds/voicemail
-@dirrm share/asterisk/sounds/digits
-@dirrm share/asterisk/sounds
-@dirrm share/asterisk/mohmp3
-@dirrm share/asterisk/keys
-@dirrm share/asterisk/images
-@dirrm share/asterisk/agi-bin
-@dirrm share/asterisk
-@dirrm lib/asterisk/modules
-@dirrm lib/asterisk
-@dirrm include/asterisk
-@dirrm etc/asterisk
-@cwd /var
-spool/asterisk/vm
-spool/asterisk/voicemail/default/1234/busy.gsm
-spool/asterisk/voicemail/default/1234/unavail.gsm
-@exec mkdir -p %D/log/asterisk/cdr-csv
-@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX
-@dirrm spool/asterisk/voicemail/default/1234/INBOX
-@dirrm spool/asterisk/voicemail/default/1234
-@dirrm spool/asterisk/voicemail/default
-@dirrm spool/asterisk/voicemail
-@dirrm spool/asterisk
-@dirrm log/asterisk/cdr-csv
-@dirrm log/asterisk
diff --git a/net/asterisk-devel/Makefile b/net/asterisk-devel/Makefile
deleted file mode 100644
index 82db2899e80a..000000000000
--- a/net/asterisk-devel/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for:	asterisk
-# Date created:				17 October 2003
-# Whom:					Maxim Sobolev <sobomax@portaone.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	asterisk
-PORTVERSION=	0.7.2
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
-		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
-
-MAINTAINER=	sobomax@FreeBSD.org
-COMMENT=	An Open Source PBX and telephony toolkit
-
-FORBIDDEN=	http://people.freebsd.org/~eik/portaudit/27c331d5-64c7-11d8-80e3-0020ed76ef5a.html
-
-ONLY_FOR_ARCHS=	i386
-
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
-		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
-LIB_DEPENDS=	speex.2:${PORTSDIR}/audio/speex
-RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
-
-GNU_CONFIGURE=	yes
-CONFIGURE_WRKSRC=	${WRKSRC}/editline
-USE_GMAKE=	yes
-USE_OPENLDAP=	yes
-MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		MKDIR="${MKDIR}" \
-		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \
-		OSVERSION=${OSVERSION} \
-		CXX="${CXX}"
-
-.include <bsd.port.mk>
diff --git a/net/asterisk-devel/distinfo b/net/asterisk-devel/distinfo
deleted file mode 100644
index 13e376bb0fae..000000000000
--- a/net/asterisk-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (asterisk-0.7.2.tar.gz) = a1f9485f5f85a4e4129782b6e642e236
-SIZE (asterisk-0.7.2.tar.gz) = 2779788
diff --git a/net/asterisk-devel/files/patch-Makefile b/net/asterisk-devel/files/patch-Makefile
deleted file mode 100644
index 1e4ffbe62070..000000000000
--- a/net/asterisk-devel/files/patch-Makefile
+++ /dev/null
@@ -1,301 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig	Wed Jan 14 08:48:38 2004
-+++ Makefile	Fri Jan 30 02:25:09 2004
-@@ -43,10 +43,10 @@
- #K6OPT  = -DK6OPT
- 
- #Tell gcc to optimize the asterisk's code
--OPTIMIZE=-O6
-+#OPTIMIZE=-O6
- 
- #Include debug symbols in the executables (-g) and profiling info (-pg)
--DEBUG=-g #-pg
-+#DEBUG=-g #-pg
- 
- # New hangup routines for chan_zap.c
- # If this flag is uncommented then you need to have new libpri code in your system
-@@ -68,7 +68,7 @@
- 
- # Where to install asterisk after compiling
- # Default -> leave empty
--INSTALL_PREFIX=
-+INSTALL_PREFIX=$(PREFIX)
- 
- # Staging directory
- # Files are copied here temporarily during the install process
-@@ -88,28 +88,26 @@
- # Don't use together with -DBUSYDETECT_TONEONLY
- BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
- 
--ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
--ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
-+ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk
-+ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk
- ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
--ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
--ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
--ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
-+ASTSPOOLDIR=/var/spool/asterisk
-+ASTLOGDIR=/var/log/asterisk
-+ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk
- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
--ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
--ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
--ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
-+ASTBINDIR=$(INSTALL_PREFIX)/bin
-+ASTSBINDIR=$(INSTALL_PREFIX)/sbin
-+ASTVARRUNDIR=/var/run
- 
- MODULES_DIR=$(ASTLIBDIR)/modules
- AGI_DIR=$(ASTVARLIBDIR)/agi-bin
- 
- INCLUDE=-Iinclude -I../include
--CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
- CFLAGS+=$(OPTIMIZE)
--CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- ifeq (${OSARCH},FreeBSD)
--CFLAGS+=-pthread
--INCLUDE+=-I/usr/local/include
-+CFLAGS+=$(PTHREAD_CFLAGS)
- endif
- ifeq (${OSARCH},OpenBSD)
- CFLAGS+=-pthread
-@@ -151,7 +149,7 @@
- LIBS=-pthread
- else
- ifeq (${OSARCH},FreeBSD)
--LIBS=-pthread
-+LIBS=$(PTHREAD_LIBS)
- else
- endif
- endif
-@@ -179,7 +177,7 @@
- SOLINK=-shared -Xlinker -x
- endif
- 
--CC=gcc
-+CC?=gcc
- INSTALL=install
- 
- _all: all
-@@ -200,13 +198,13 @@
- 	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
- 	$(MAKE) -C editline libedit.a
- 
--db1-ast/libdb1.a: FORCE
--	@if [ -d db1-ast ]; then \
--		$(MAKE) -C db1-ast libdb1.a ; \
--	else \
--		echo "You need to do a cvs update -d not just cvs update"; \
--		exit 1; \
--	fi
-+#db1-ast/libdb1.a: FORCE
-+#	@if [ -d db1-ast ]; then \
-+#		$(MAKE) -C db1-ast libdb1.a ; \
-+#	else \
-+#		echo "You need to do a cvs update -d not just cvs update"; \
-+#		exit 1; \
-+#	fi
- 
- ifneq ($(wildcard .depend),)
- include .depend
-@@ -244,8 +242,8 @@
- 		exit 1; \
- 	fi
- 
--asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
--	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a
-+asterisk: editline/libedit.a stdtime/libtime.a $(OBJS)
-+	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) stdtime/libtime.a
- 
- subdirs: 
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
-@@ -260,10 +258,10 @@
- 	$(MAKE) -C stdtime clean
- 
- datafiles: all
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
- 	for x in sounds/digits/*.gsm; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
-@@ -271,18 +269,18 @@
- 	done
- 	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-*; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
- 		fi; \
- 	done
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/images
- 	for x in images/*.jpg; do \
--		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
- 	done
--	mkdir -p $(DESTDIR)$(AGI_DIR)
-+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
- 
- update: 
- 	@if [ -d CVS ]; then \
-@@ -294,105 +292,74 @@
- 	fi
- 
- bininstall: all
--	mkdir -p $(DESTDIR)$(MODULES_DIR)
--	mkdir -p $(DESTDIR)$(ASTSBINDIR)
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	mkdir -p $(DESTDIR)$(ASTBINDIR)
--	mkdir -p $(DESTDIR)$(ASTSBINDIR)
--	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
--	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
--	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
-+	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
-+	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
- 	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
--		install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
-+		$(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
- 	fi
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
--	install -d $(DESTDIR)$(ASTHEADERDIR)
--	install -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
-+	$(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
- 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm
--	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail
--	if [ ! -h $(DESTDIR)$(ASTSPOOLDIR)/vm ] && [ -d $(DESTDIR)$(ASTSPOOLDIR)/vm ]; then \
--		mv $(DESTDIR)$(ASTSPOOLDIR)/vm $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \
--	else \
--		mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \
--		rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \
--	fi
--	ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_ixj.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_tor.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_mysql.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_unixodbc.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/codec_mp3_d.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/format_mp3.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/app_voicemail2.so
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
--	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
--	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
--	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/vm . )
--	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
--	@echo " +---- Asterisk Installation Complete -------+"  
--	@echo " +                                           +"
--	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
--	@echo " +                                           +"
--	@echo " + Asterisk has successfully been installed. +"  
--	@echo " + If you would like to install the sample   +"  
--	@echo " + configuration files (overwriting any      +"
--	@echo " + existing config files), run:              +"  
--	@echo " +                                           +"
--	@echo " +               $(MAKE) samples                +"
--	@echo " +                                           +"
--	@echo " +-----------------  or ---------------------+"
--	@echo " +                                           +"
--	@echo " + You can go ahead and install the asterisk +"
--	@echo " + program documentation now or later run:   +"
--	@echo " +                                           +"
--	@echo " +              $(MAKE) progdocs                +"
--	@echo " +                                           +"
--	@echo " + **Note** This requires that you have      +"
--	@echo " + doxygen installed on your local system    +"
--	@echo " +-------------------------------------------+"
-+	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/vm . )
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/voicemail . )
- 
--install: all datafiles bininstall
-+install: all datafiles bininstall samples
- 
- upgrade: all bininstall
- 
- adsi: all
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
- 	for x in configs/*.adsi; do \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x`-dist; \
- 		if ! [ -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \
--			install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
- 		fi ; \
- 	done
- 
- samples: all datafiles adsi
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	for x in configs/*.sample; do \
--		if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
--			mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	for x in configs/*.sample channels/h323/*.sample; do \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\
-+		if ! [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
- 		fi ; \
--		install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
- 	done
--	echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
-+	echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	if ! [ -f $(DESTDIR)$(ASTETCDIR)/asterisk.conf ]; then \
-+		$(BSD_INSTALL_DATA) $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist $(DESTDIR)$(ASTETCDIR)/asterisk.conf; \
-+	fi
- 	for x in sounds/demo-*; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
- 		fi; \
- 	done
- 	for x in sounds/*.mp3; do \
--		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
- 	done
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
- 	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
- 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
- 		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
diff --git a/net/asterisk-devel/files/patch-agi::Makefile b/net/asterisk-devel/files/patch-agi::Makefile
deleted file mode 100644
index 567c30f5624e..000000000000
--- a/net/asterisk-devel/files/patch-agi::Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-
-$FreeBSD$
-
---- agi/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ agi/Makefile	Fri Jan 30 02:31:07 2004
-@@ -11,21 +11,24 @@
- # the GNU General Public License
- #
- 
--AGIS=agi-test.agi eagi-test eagi-sphinx-test
-+AGIS_BIN=eagi-test eagi-sphinx-test
-+AGIS_SCR=agi-test.agi
-+AGIS=$(AGIS_SCR) $(AGIS_BIN)
- 
- CFLAGS+=
- 
- all: depend $(AGIS)
- 
- install: all
--	mkdir -p $(DESTDIR)$(AGI_DIR)
--	for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
-+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
-+	for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done
-+	for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
- 
- eagi-test: eagi-test.o
--	$(CC) -o eagi-test eagi-test.o
-+	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
- 	
- eagi-sphinx-test: eagi-sphinx-test.o
--	$(CC) -o eagi-sphinx-test eagi-sphinx-test.o
-+	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o
- 
- clean:
- 	rm -f *.so *.o look .depend
diff --git a/net/asterisk-devel/files/patch-apps::Makefile b/net/asterisk-devel/files/patch-apps::Makefile
deleted file mode 100644
index 901ba694c33a..000000000000
--- a/net/asterisk-devel/files/patch-apps::Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- apps/Makefile.orig	Mon Jan 12 03:56:38 2004
-+++ apps/Makefile	Fri Jan 30 01:47:34 2004
-@@ -59,17 +59,17 @@
- 	$(CC) $(SOLINK) -o $@ $< -ltonezone
- 
- install: all
--	for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- app_todd.o: app_todd.c
--	gcc -pipe -O6 -g  -Iinclude -I../include -D_REENTRANT -march=i586 -DDO_CRASH -c -o  app_todd.o app_todd.c
-+	$(CC) $(CFLAGS) -Iinclude -I../include -D_REENTRANT -DDO_CRASH -c -o  app_todd.o app_todd.c
- 
- app_todd.so: app_todd.o
--	$(CC) $(SOLINK) -o $@ $< -L/usr/local/ssl/lib -lssl -lcrypto
-+	$(CC) $(SOLINK) -o $@ $< -lssl -lcrypto
- 
- app_voicemail.so : app_voicemail.o
- ifeq ($(USE_MYSQL_VM_INTERFACE),1)
--	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient -lz
-+	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L$(LOCALBASE)/lib/mysql -lmysqlclient -lz
- else
- ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
- 	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq
-@@ -88,7 +88,7 @@
- 	$(CC) $(SOLINK) -o $@ $< -lodbc
- 
- look:	look.c
--	gcc -pipe -O6 -g look.c -o look -lncurses
-+	$(CC) $(CFLAGS) look.c -o look -lncurses
- 
- ifneq ($(wildcard .depend),)
- include .depend
diff --git a/net/asterisk-devel/files/patch-apps::app_intercom.c b/net/asterisk-devel/files/patch-apps::app_intercom.c
deleted file mode 100644
index e4ac57f8e31b..000000000000
--- a/net/asterisk-devel/files/patch-apps::app_intercom.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- apps/app_intercom.c.orig	Wed Oct 22 06:10:24 2003
-+++ apps/app_intercom.c	Fri Jan 30 01:52:03 2004
-@@ -29,7 +29,7 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk-devel/files/patch-astman::Makefile b/net/asterisk-devel/files/patch-astman::Makefile
deleted file mode 100644
index cf31005257cf..000000000000
--- a/net/asterisk-devel/files/patch-astman::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- astman/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ astman/Makefile	Fri Jan 30 01:47:34 2004
-@@ -8,7 +8,7 @@
- install:
- 	if [ "$(TARGET)" != "none" ]; then \
- 		for x in $(TARGET); do \
--			install -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/astman; \
-+			$(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/astman; \
- 		done ; \
- 	fi
- 
diff --git a/net/asterisk-devel/files/patch-cdr::Makefile b/net/asterisk-devel/files/patch-cdr::Makefile
deleted file mode 100644
index 2ede608f9019..000000000000
--- a/net/asterisk-devel/files/patch-cdr::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- cdr/Makefile.orig	Sun Jan 11 21:17:02 2004
-+++ cdr/Makefile	Fri Jan 30 01:47:34 2004
-@@ -43,7 +43,7 @@
- all: depend $(MODS)
- 
- install: all
--	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- clean:
- 	rm -f *.so *.o .depend
diff --git a/net/asterisk-devel/files/patch-channels::Makefile b/net/asterisk-devel/files/patch-channels::Makefile
deleted file mode 100644
index d05ee2c13676..000000000000
--- a/net/asterisk-devel/files/patch-channels::Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-
-$FreeBSD$
-
---- channels/Makefile.orig	Fri Jan 23 22:57:48 2004
-+++ channels/Makefile	Thu Feb 19 01:48:41 2004
-@@ -26,12 +26,10 @@
- #
- #CHANNEL_LIBS+=chan_vofr
- 
--ifneq (${OSARCH},Darwin)
- CHANNEL_LIBS+=chan_oss.so
--endif
- 
- CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
--CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
-+CHANNEL_LIBS+=chan_h323.so
- 
- CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
- CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
-@@ -99,10 +97,8 @@
- 
- chan_oss.o: chan_oss.c  busy.h ringtone.h
- 
--ifeq (${OSARCH},OpenBSD)
- chan_oss.so: chan_oss.o
--	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
--endif
-+	$(CC) $(SOLINK) -o $@ chan_oss.o
- 
- chan_iax2.so: chan_iax2.o iax2-parser.o
- ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -146,15 +142,17 @@
- chan_vpb.so: chan_vpb.o
- 	 $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl
- 
--chan_h323.so: chan_h323.o h323/libchanh323.a
--	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+chan_h323.so: chan_h323.o h323/ast_h323.o
-+	$(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
- 
-+h323/ast_h323.o:
-+	$(MAKE) -C h323 ast_h323.o
- 
- #chan_modem.so : chan_modem.o
- #	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<
- 
- install: all
--	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk-devel/files/patch-channels::chan_h323.c b/net/asterisk-devel/files/patch-channels::chan_h323.c
deleted file mode 100644
index e413bd8ecec8..000000000000
--- a/net/asterisk-devel/files/patch-channels::chan_h323.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_h323.c.orig	Tue Jan 13 11:24:26 2004
-+++ channels/chan_h323.c	Fri Jan 30 01:47:34 2004
-@@ -54,6 +54,7 @@
- #include <fcntl.h>
- #include <netdb.h>
- #include <sys/signal.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- 
- 
diff --git a/net/asterisk-devel/files/patch-channels::chan_oss.c b/net/asterisk-devel/files/patch-channels::chan_oss.c
deleted file mode 100644
index 1006b377874e..000000000000
--- a/net/asterisk-devel/files/patch-channels::chan_oss.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_oss.c.orig	Wed Oct 22 06:10:34 2003
-+++ channels/chan_oss.c	Fri Jan 30 01:50:35 2004
-@@ -36,7 +36,7 @@
- #ifdef __linux
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk-devel/files/patch-channels::h323::Makefile b/net/asterisk-devel/files/patch-channels::h323::Makefile
deleted file mode 100644
index a9159b4441c1..000000000000
--- a/net/asterisk-devel/files/patch-channels::h323::Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-
-$FreeBSD$
-
---- channels/h323/Makefile.orig	Sun Jan 11 04:22:32 2004
-+++ channels/h323/Makefile	Fri Jan 30 01:47:34 2004
-@@ -19,7 +19,7 @@
- #
- # This needs to be updated to deal with more than just little endian machines
- #
--CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
-+CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
- 
- 
- #############################################
-@@ -27,38 +27,39 @@
- # Only change below if you know WTF your doing
- #
- CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
--CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
--CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
-+CFLAGS += -Wall -fPIC
-+CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
- CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
- CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
- CFLAGS += -I../../include
- CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
--CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
-+CFLAGS += -I$(OPENH323DIR)/include
- 
- 
- all:   	libchanh323.a
- 
- samples: 
--	if [ -f $(ASTETCDIR)/h323.conf ]; then \
--		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
-+	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
-+	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
-+		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
- 	fi ; 
--	install h323.conf.sample $(ASTETCDIR)/h323.conf
-  
- 
- ast_h323.o:	ast_h323.cpp
--	g++ -g -c -o $@ $(CFLAGS) $<
-+	$(CXX) -c -o $@ $(CFLAGS) $<
- 
- libchanh323.a:	ast_h323.o
- 	ar cr libchanh323.a ast_h323.o
- 
- chan_h323.so:	
--	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
- 
- chan_h323_d.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
- 
- chan_h323_s.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
-+
- clean:
- 	rm -f *.o *.so core.* libchanh323.a
- 
diff --git a/net/asterisk-devel/files/patch-codecs::Makefile b/net/asterisk-devel/files/patch-codecs::Makefile
deleted file mode 100644
index b802dc1233e8..000000000000
--- a/net/asterisk-devel/files/patch-codecs::Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-
-$FreeBSD$
-
---- codecs/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ codecs/Makefile	Fri Jan 30 01:47:34 2004
-@@ -17,23 +17,22 @@
- # g723.1b)
- #
- #MODG723=codec_g723_1.so codec_g723_1b.so
--MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
--MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
--MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
-+MODG723=codec_g723_1_dummy.so
-+MODG729=codec_g729_dummy.so
-+MODSPEEX=codec_speex.so
- MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
--CFLAGS+=-fPIC
--CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
-+CFLAGS+=-fPIC -I$(LOCALBASE)/include
- 
- LIBG723=g723.1/libg723.a
- LIBG723B=g723.1b/libg723b.a
- LIBGSM=gsm/lib/libgsm.a
- LIBGSMT=gsm/lib/libgsm.a
- LIBLPC10=lpc10/liblpc10.a
--LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib")
-+LIBSPEEX=-L$(LOCALBASE)/lib
- LIBSPEEX+=-lspeex -lm
- LIBILBC=ilbc/libilbc.a
- 
--CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-+CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so
- 
- all: depend $(CODECS)
-@@ -88,7 +87,7 @@
- include .depend
- 
- install: all
--	for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(CODECS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk-devel/files/patch-codecs::codec_g723_1_dummy.c b/net/asterisk-devel/files/patch-codecs::codec_g723_1_dummy.c
deleted file mode 100644
index 661ff2d88602..000000000000
--- a/net/asterisk-devel/files/patch-codecs::codec_g723_1_dummy.c
+++ /dev/null
@@ -1,314 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g723_1_dummy.c	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,308 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Translate between signed linear and G.723.1 (dummy!)
-+ *
-+ * The G.723.1 code is not included in the Asterisk distribution because
-+ * it is covered with patents, and in spite of statements to the contrary,
-+ * the "technology" is extremely expensive to license.
-+ * 
-+ * Copyright (C) 1999, Mark Spencer
-+ *
-+ * Mark Spencer <markster@linux-support.net>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#define TYPE_HIGH	 0x0
-+#define TYPE_LOW	 0x1
-+#define TYPE_SILENCE	 0x2
-+#define TYPE_DONTSEND	 0x3
-+#define TYPE_MASK	 0x3
-+
-+#include <sys/types.h>
-+#include <asterisk/translate.h>
-+#include <asterisk/module.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/channel.h>
-+#include <pthread.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <netinet/in.h>
-+#include <string.h>
-+#include <stdio.h>
-+
-+/* Sample frame data */
-+#include "slin_g723_ex.h"
-+#include "g723_slin_ex.h"
-+
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
-+static int localusecnt=0;
-+
-+static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator";
-+
-+struct g723_encoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Buffer for our outgoing frame */
-+	char outbuf[8000];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+struct g723_decoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+static struct ast_translator_pvt *g723tolin_new()
-+{
-+	struct g723_decoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g723_decoder_pvt));
-+	if (tmp) {
-+		tmp->tail = 0;
-+		localusecnt++;
-+		ast_update_use_count();
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *lintog723_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_SLINEAR;
-+	f.datalen = sizeof(slin_g723_ex);
-+	/* Assume 8000 Hz */
-+	f.samples = sizeof(slin_g723_ex)/16;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = slin_g723_ex;
-+	return &f;
-+}
-+
-+static struct ast_frame *g723tolin_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_G723_1;
-+	f.datalen = sizeof(g723_slin_ex);
-+	/* All frames are 30 ms long */
-+	f.samples = 30;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = g723_slin_ex;
-+	return &f;
-+}
-+
-+static struct ast_translator_pvt *lintog723_new()
-+{
-+	struct g723_encoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g723_encoder_pvt));
-+	if (tmp) {
-+		localusecnt++;
-+		ast_update_use_count();
-+		tmp->tail = 0;
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *g723tolin_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt;
-+	if (!tmp->tail)
-+		return NULL;
-+	/* Signed linear is no particular frame size, so just send whatever
-+	   we have in the buffer in one lump sum */
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_SLINEAR;
-+	tmp->f.datalen = tmp->tail * 2;
-+	/* Assume 8000 Hz */
-+	tmp->f.samples = tmp->tail / 8;
-+	tmp->f.mallocd = 0;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.data = tmp->buf;
-+	/* Reset tail pointer */
-+	tmp->tail = 0;
-+
-+	return &tmp->f;	
-+}
-+
-+static int g723_len(unsigned char buf)
-+{
-+	switch(buf & TYPE_MASK) {
-+	case TYPE_DONTSEND:
-+		return 2;
-+		break;
-+	case TYPE_SILENCE:
-+		return 4;
-+		break;
-+	case TYPE_HIGH:
-+		return 24;
-+		break;
-+	case TYPE_LOW:
-+		return 20;
-+		break;
-+	default:
-+		ast_log(LOG_WARNING, "Badly encoded frame (%d)\n", buf & TYPE_MASK);
-+	}
-+	return -1;
-+}
-+
-+static int g723tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt;
-+	int len = 0;
-+	int res;
-+	while(len < f->datalen) {
-+		/* Assuming there's space left, decode into the current buffer at
-+		   the tail location */
-+		res = g723_len(((unsigned char *)f->data + len)[0]);
-+		if (res < 0) {
-+			ast_log(LOG_WARNING, "Invalid data\n");
-+			return -1;
-+		}
-+		if (res + len > f->datalen) {
-+			ast_log(LOG_WARNING, "Measured length exceeds frame length\n");
-+			return -1;
-+		}
-+		if (tmp->tail + 480 < sizeof(tmp->buf)/2) {	
-+			memset(tmp->buf + tmp->tail, 0, 480);
-+			tmp->tail+=480;
-+		} else {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return -1;
-+		}
-+		len += res;
-+	}
-+	return 0;
-+}
-+
-+static int lintog723_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	/* Just add the frames to our stream */
-+	/* XXX We should look at how old the rest of our stream is, and if it
-+	   is too old, then we should overwrite it entirely, otherwise we can
-+	   get artifacts of earlier talk that do not belong */
-+	struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt;
-+	if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) {
-+		memcpy(&tmp->buf[tmp->tail], f->data, f->datalen);
-+		tmp->tail += f->datalen/2;
-+	} else {
-+		ast_log(LOG_WARNING, "Out of buffer space\n");
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static struct ast_frame *lintog723_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt;
-+	int cnt=0;
-+	/* We can't work on anything less than a frame in size */
-+	if (tmp->tail < 480)
-+		return NULL;
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_G723_1;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.samples = 0;
-+	tmp->f.mallocd = 0;
-+	while(tmp->tail >= 480) {
-+		/* Encode a frame of data */
-+		if (cnt + 24 >= sizeof(tmp->outbuf)) {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return NULL;
-+		}
-+		memset(tmp->outbuf + cnt, 0, 24);
-+		/* Assume 8000 Hz */
-+		tmp->f.samples += 30;
-+		cnt += 24;
-+		tmp->tail -= 480;
-+		/* Move the data at the end of the buffer to the front */
-+		if (tmp->tail)
-+			memmove(tmp->buf, tmp->buf + 480, tmp->tail * 2);
-+	}
-+	tmp->f.datalen = cnt;
-+	tmp->f.data = tmp->outbuf;
-+	return &tmp->f;	
-+}
-+
-+static void g723_destroy(struct ast_translator_pvt *pvt)
-+{
-+	free(pvt);
-+	localusecnt--;
-+	ast_update_use_count();
-+}
-+
-+static struct ast_translator g723tolin =
-+	{ "g723tolin_dummy", 
-+	   AST_FORMAT_G723_1, AST_FORMAT_SLINEAR,
-+	   g723tolin_new,
-+	   g723tolin_framein,
-+	   g723tolin_frameout,
-+	   g723_destroy,
-+	   g723tolin_sample
-+	   };
-+
-+static struct ast_translator lintog723 =
-+	{ "lintog723_dummy", 
-+	   AST_FORMAT_SLINEAR, AST_FORMAT_G723_1,
-+	   lintog723_new,
-+	   lintog723_framein,
-+	   lintog723_frameout,
-+	   g723_destroy,
-+	   lintog723_sample
-+	   };
-+
-+int unload_module(void)
-+{
-+	int res;
-+	ast_mutex_lock(&localuser_lock);
-+	res = ast_unregister_translator(&lintog723);
-+	if (!res)
-+		res = ast_unregister_translator(&g723tolin);
-+	if (localusecnt)
-+		res = -1;
-+	ast_mutex_unlock(&localuser_lock);
-+	return res;
-+}
-+
-+int load_module(void)
-+{
-+	int res;
-+	res=ast_register_translator(&g723tolin);
-+	if (!res) 
-+		res=ast_register_translator(&lintog723);
-+	else
-+		ast_unregister_translator(&g723tolin);
-+	return res;
-+}
-+
-+char *description(void)
-+{
-+	return tdesc;
-+}
-+
-+int usecount(void)
-+{
-+	int res;
-+	STANDARD_USECOUNT(res);
-+	return res;
-+}
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk-devel/files/patch-codecs::codec_g729_dummy.c b/net/asterisk-devel/files/patch-codecs::codec_g729_dummy.c
deleted file mode 100644
index c3e27d98e27e..000000000000
--- a/net/asterisk-devel/files/patch-codecs::codec_g729_dummy.c
+++ /dev/null
@@ -1,281 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g729_dummy.c	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,275 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Translate between signed linear and G.729 (dummy!)
-+ *
-+ * The G.729 code is not included in the Asterisk distribution because
-+ * it is covered with patents, and in spite of statements to the contrary,
-+ * the "technology" is extremely expensive to license.
-+ * 
-+ * Copyright (C) 1999, Mark Spencer
-+ *
-+ * Mark Spencer <markster@linux-support.net>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#include <sys/types.h>
-+#include <asterisk/translate.h>
-+#include <asterisk/module.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/channel.h>
-+#include <pthread.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <netinet/in.h>
-+#include <string.h>
-+#include <stdio.h>
-+
-+/* Sample frame data */
-+#include "slin_g729_ex.h"
-+#include "g729_slin_ex.h"
-+
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
-+static int localusecnt=0;
-+
-+static char *tdesc = "Dummy G.729/PCM16 Codec Translator";
-+
-+struct g729_encoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Buffer for our outgoing frame */
-+	char outbuf[8000];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+struct g729_decoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+static struct ast_translator_pvt *g729tolin_new()
-+{
-+	struct g729_decoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g729_decoder_pvt));
-+	if (tmp) {
-+		tmp->tail = 0;
-+		localusecnt++;
-+		ast_update_use_count();
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *lintog729_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_SLINEAR;
-+	f.datalen = sizeof(slin_g729_ex);
-+	/* Assume 8000 Hz */
-+	f.samples = sizeof(slin_g729_ex)/16;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = slin_g729_ex;
-+	return &f;
-+}
-+
-+static struct ast_frame *g729tolin_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_G729A;
-+	f.datalen = sizeof(g729_slin_ex);
-+	/* All frames are 10 ms long */
-+	f.samples = 10;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = g729_slin_ex;
-+	return &f;
-+}
-+
-+static struct ast_translator_pvt *lintog729_new()
-+{
-+	struct g729_encoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g729_encoder_pvt));
-+	if (tmp) {
-+		localusecnt++;
-+		ast_update_use_count();
-+		tmp->tail = 0;
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *g729tolin_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt;
-+	if (!tmp->tail)
-+		return NULL;
-+	/* Signed linear is no particular frame size, so just send whatever
-+	   we have in the buffer in one lump sum */
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_SLINEAR;
-+	tmp->f.datalen = tmp->tail * 2;
-+	/* Assume 8000 Hz */
-+	tmp->f.samples = tmp->tail / 8;
-+	tmp->f.mallocd = 0;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.data = tmp->buf;
-+	/* Reset tail pointer */
-+	tmp->tail = 0;
-+
-+	return &tmp->f;	
-+}
-+
-+static int g729tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt;
-+	int len = 0;
-+	while(len < f->datalen) {
-+		/* Assuming there's space left, decode into the current buffer at
-+		   the tail location */
-+		if (10 + len > f->datalen) {
-+			ast_log(LOG_WARNING, "Measured length exceeds frame length\n");
-+			return -1;
-+		}
-+		if (tmp->tail + 160 < sizeof(tmp->buf)/2) {	
-+			memset(tmp->buf + tmp->tail, 0, 160);
-+			tmp->tail+=160;
-+		} else {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return -1;
-+		}
-+		len += 10;
-+	}
-+	return 0;
-+}
-+
-+static int lintog729_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	/* Just add the frames to our stream */
-+	/* XXX We should look at how old the rest of our stream is, and if it
-+	   is too old, then we should overwrite it entirely, otherwise we can
-+	   get artifacts of earlier talk that do not belong */
-+	struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt;
-+	if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) {
-+		memcpy(&tmp->buf[tmp->tail], f->data, f->datalen);
-+		tmp->tail += f->datalen/2;
-+	} else {
-+		ast_log(LOG_WARNING, "Out of buffer space\n");
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static struct ast_frame *lintog729_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt;
-+	int cnt=0;
-+	/* We can't work on anything less than a frame in size */
-+	if (tmp->tail < 160)
-+		return NULL;
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_G729A;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.samples = 0;
-+	tmp->f.mallocd = 0;
-+	while(tmp->tail >= 160) {
-+		/* Encode a frame of data */
-+		if (cnt + 10 >= sizeof(tmp->outbuf)) {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return NULL;
-+		}
-+		memset(tmp->outbuf + cnt, 0, 10);
-+		/* Assume 8000 Hz */
-+		tmp->f.samples += 10;
-+		cnt += 10;
-+		tmp->tail -= 160;
-+		/* Move the data at the end of the buffer to the front */
-+		if (tmp->tail)
-+			memmove(tmp->buf, tmp->buf + 160, tmp->tail * 2);
-+	}
-+	tmp->f.datalen = cnt;
-+	tmp->f.data = tmp->outbuf;
-+	return &tmp->f;	
-+}
-+
-+static void g729_destroy(struct ast_translator_pvt *pvt)
-+{
-+	free(pvt);
-+	localusecnt--;
-+	ast_update_use_count();
-+}
-+
-+static struct ast_translator g729tolin =
-+	{ "g729tolin_dummy", 
-+	   AST_FORMAT_G729A, AST_FORMAT_SLINEAR,
-+	   g729tolin_new,
-+	   g729tolin_framein,
-+	   g729tolin_frameout,
-+	   g729_destroy,
-+	   g729tolin_sample
-+	   };
-+
-+static struct ast_translator lintog729 =
-+	{ "lintog729_dummy", 
-+	   AST_FORMAT_SLINEAR, AST_FORMAT_G729A,
-+	   lintog729_new,
-+	   lintog729_framein,
-+	   lintog729_frameout,
-+	   g729_destroy,
-+	   lintog729_sample
-+	   };
-+
-+int unload_module(void)
-+{
-+	int res;
-+	ast_mutex_lock(&localuser_lock);
-+	res = ast_unregister_translator(&lintog729);
-+	if (!res)
-+		res = ast_unregister_translator(&g729tolin);
-+	if (localusecnt)
-+		res = -1;
-+	ast_mutex_unlock(&localuser_lock);
-+	return res;
-+}
-+
-+int load_module(void)
-+{
-+	int res;
-+	res=ast_register_translator(&g729tolin);
-+	if (!res) 
-+		res=ast_register_translator(&lintog729);
-+	else
-+		ast_unregister_translator(&g729tolin);
-+	return res;
-+}
-+
-+char *description(void)
-+{
-+	return tdesc;
-+}
-+
-+int usecount(void)
-+{
-+	int res;
-+	STANDARD_USECOUNT(res);
-+	return res;
-+}
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk-devel/files/patch-codecs::g729_slin_ex.h b/net/asterisk-devel/files/patch-codecs::g729_slin_ex.h
deleted file mode 100644
index 44e60f2de848..000000000000
--- a/net/asterisk-devel/files/patch-codecs::g729_slin_ex.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/g729_slin_ex.h	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,14 @@
-+/*
-+ * g729_slin_ex.h --
-+ *
-+ *      8-bit G.729 data, 10 milliseconds worth at 8 kHz.
-+ *
-+ * Copyright (C) 2004, Maxim Sobolev <sobomax@FreeBSD.org>
-+ *
-+ * Distributed under the terms of the GNU General Public License
-+ *
-+ */
-+
-+static unsigned char g729_slin_ex[] = {
-+120,82,175,64,0,250,219,0,7,214
-+};
diff --git a/net/asterisk-devel/files/patch-codecs::gsm::Makefile b/net/asterisk-devel/files/patch-codecs::gsm::Makefile
deleted file mode 100644
index d60ed11f3298..000000000000
--- a/net/asterisk-devel/files/patch-codecs::gsm::Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- codecs/gsm/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/gsm/Makefile	Fri Jan 30 01:47:34 2004
-@@ -60,8 +60,8 @@
- # CC		= /usr/lang/acc
- # CCFLAGS 	= -c -O
- 
--CC		= gcc $(OPTIMIZE) -fomit-frame-pointer 
--CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
-+CC		?= gcc
-+CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer
- 
- LD 		= $(CC)
- 
-@@ -146,7 +146,7 @@
- DEBUG	= -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
- 
--CFLAGS	= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
-+CFLAGS	+= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
- 	$(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC)
- ######### It's $(CC) $(CFLAGS)
- 
diff --git a/net/asterisk-devel/files/patch-codecs::ilbc::Makefile b/net/asterisk-devel/files/patch-codecs::ilbc::Makefile
deleted file mode 100644
index 7770e07550a4..000000000000
--- a/net/asterisk-devel/files/patch-codecs::ilbc::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-
-$FreeBSD$
-
---- codecs/ilbc/Makefile.orig	Sun Apr 27 21:13:11 2003
-+++ codecs/ilbc/Makefile	Fri Jan 30 01:47:34 2004
-@@ -1,4 +1,4 @@
--CFLAGS+= -fPIC -O3
-+CFLAGS+= -fPIC
- LIB=libilbc.a
- 
- OBJS= anaFilter.o iCBSearch.o packing.o \
diff --git a/net/asterisk-devel/files/patch-codecs::lpc10::Makefile b/net/asterisk-devel/files/patch-codecs::lpc10::Makefile
deleted file mode 100644
index 68c98c064f70..000000000000
--- a/net/asterisk-devel/files/patch-codecs::lpc10::Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD$
-
---- codecs/lpc10/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/lpc10/Makefile	Fri Jan 30 02:06:54 2004
-@@ -3,7 +3,7 @@
- # 
- 
- # default C compiler
--CC= gcc
-+CC?= gcc
- 
- # 
- # These definitions for CFLAGS and LIB_TARGET_DIR are used when one
-@@ -22,14 +22,14 @@
- # 
- 
- WARNINGS = -Wall -Wno-comment -Wno-error
--CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
-+CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
- #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
- 
- #fix for PPC processors
- ifneq ($(OSARCH),Darwin)
- ifneq ($(PROC),ppc)
- ifneq ($(PROC),x86_64)
--	CFLAGS+= -march=$(PROC)
-+	CFLAGS+= 
- endif
- endif
- endif
diff --git a/net/asterisk-devel/files/patch-codecs::slin_g729_ex.h b/net/asterisk-devel/files/patch-codecs::slin_g729_ex.h
deleted file mode 100644
index e1236d2498dc..000000000000
--- a/net/asterisk-devel/files/patch-codecs::slin_g729_ex.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/slin_g729_ex.h	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,25 @@
-+/*
-+ * slin_g729_ex.h --
-+ *
-+ *	Signed 16-bit audio data, 10 milliseconds worth at 8 kHz.
-+ *
-+ * Source: g723.example
-+ *
-+ * Copyright (C) 2001, Linux Support Services, Inc.
-+ *
-+ * Distributed under the terms of the GNU General Public License
-+ *
-+ */
-+
-+static signed short slin_g729_ex[] = {
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
-+};
diff --git a/net/asterisk-devel/files/patch-db.c b/net/asterisk-devel/files/patch-db.c
deleted file mode 100644
index 59e5cef87770..000000000000
--- a/net/asterisk-devel/files/patch-db.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- db.c.orig	Tue Dec  2 17:12:56 2003
-+++ db.c	Fri Jan 30 01:47:34 2004
-@@ -32,7 +32,7 @@
- #include <asterisk/options.h>
- #include <asterisk/astdb.h>
- #include <asterisk/cli.h>
--#include "db1-ast/include/db.h"
-+#include <db.h>
- #include "asterisk.h"
- #include "astconf.h"
- 
diff --git a/net/asterisk-devel/files/patch-editline::configure b/net/asterisk-devel/files/patch-editline::configure
deleted file mode 100644
index f6b9c5b76eee..000000000000
--- a/net/asterisk-devel/files/patch-editline::configure
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- editline/configure.orig	Sun Apr 27 21:13:11 2003
-+++ editline/configure	Fri Jan 30 01:47:34 2004
-@@ -1906,7 +1906,7 @@
-   CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG"
-   CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE"
- else
--  CFLAGS="$CFLAGS -O"
-+  CFLAGS="$CFLAGS"
- fi
- 
- 
diff --git a/net/asterisk-devel/files/patch-formats::Makefile b/net/asterisk-devel/files/patch-formats::Makefile
deleted file mode 100644
index dacfd7b08303..000000000000
--- a/net/asterisk-devel/files/patch-formats::Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- formats/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ formats/Makefile	Fri Jan 30 01:47:34 2004
-@@ -18,7 +18,7 @@
- #
- # G723 simple frame is depricated
- #
--#FORMAT_LIBS+=format_g723.so
-+FORMAT_LIBS+=format_g723_1.so
- 
- GSMLIB=../codecs/gsm/lib/libgsm.a
- 
-@@ -40,7 +40,7 @@
- 	$(CC) $(SOLINK) -o $@ $< -lm
- 
- install: all
--	for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(FORMAT_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk-devel/files/patch-formats::format_g723_1.c b/net/asterisk-devel/files/patch-formats::format_g723_1.c
deleted file mode 100644
index 8d0755e14205..000000000000
--- a/net/asterisk-devel/files/patch-formats::format_g723_1.c
+++ /dev/null
@@ -1,351 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ formats/format_g723_1.c	Fri Jan 30 01:58:19 2004
-@@ -0,0 +1,345 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Save and read raw, headerless G723.1 Annex A data.
-+ *
-+ * Copyright (C) 1999, Mark Spencer <markster@linux-support.net>
-+ * Copyright (C) 2003, Maxim Sobolev <sobomax@FreeBSD.org>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#include <asterisk/lock.h>
-+#include <asterisk/channel.h>
-+#include <asterisk/file.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/sched.h>
-+#include <asterisk/module.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <stdlib.h>
-+#include <sys/time.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#include <string.h>
-+#include <pthread.h>
-+#ifdef __linux__
-+#include <endian.h>
-+#else
-+#include <machine/endian.h>
-+#endif
-+
-+/* Based on format_g729.c */
-+
-+#define TYPE_HIGH	0x0
-+#define TYPE_LOW	0x1
-+#define TYPE_SILENCE	0x2
-+#define TYPE_DONTSEND	0x3
-+#define TYPE_MASK	0x3
-+
-+struct ast_filestream {
-+	void *reserved[AST_RESERVED_POINTERS];
-+	/* This is what a filestream means to us */
-+	int fd; 				/* Descriptor */
-+	struct ast_frame fr;			/* Frame information */
-+	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
-+	char empty;				/* Empty character */
-+	unsigned char g723[24];			/* One Real G723.1 Frame */
-+};
-+
-+static long g723_tell(struct ast_filestream *);
-+
-+static ast_mutex_t g723_lock = AST_MUTEX_INITIALIZER;
-+static int glistcnt = 0;
-+
-+static char *name = "g723";
-+static char *desc = "Raw G723.1 Annex A data";
-+static char *exts = "g723";
-+
-+static int g723_len(unsigned char buf)
-+{
-+	switch(buf & TYPE_MASK) {
-+	case TYPE_DONTSEND:
-+		return 2;
-+		break;
-+	case TYPE_SILENCE:
-+		return 4;
-+		break;
-+	case TYPE_HIGH:
-+		return 24;
-+		break;
-+	case TYPE_LOW:
-+		return 20;
-+		break;
-+	default:
-+		ast_log(LOG_WARNING, "Badly encoded G723.1 frame (%d)\n", buf & TYPE_MASK);
-+	}
-+	return -1;
-+}
-+
-+static struct ast_filestream *g723_open(int fd)
-+{
-+	/* We don't have any header to read or anything really, but
-+	   if we did, it would go here.  We also might want to check
-+	   and be sure it's a valid file.  */
-+	struct ast_filestream *tmp;
-+	if ((tmp = malloc(sizeof(struct ast_filestream)))) {
-+		memset(tmp, 0, sizeof(struct ast_filestream));
-+		if (ast_mutex_lock(&g723_lock)) {
-+			ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+			free(tmp);
-+			return NULL;
-+		}
-+		tmp->fd = fd;
-+		tmp->fr.data = tmp->g723;
-+		tmp->fr.frametype = AST_FRAME_VOICE;
-+		tmp->fr.subclass = AST_FORMAT_G723_1;
-+		/* datalen will vary for each frame */
-+		tmp->fr.src = name;
-+		tmp->fr.mallocd = 0;
-+		glistcnt++;
-+		ast_mutex_unlock(&g723_lock);
-+		ast_update_use_count();
-+	}
-+	return tmp;
-+}
-+
-+static struct ast_filestream *g723_rewrite(int fd, char *comment)
-+{
-+	/* We don't have any header to read or anything really, but
-+	   if we did, it would go here.  We also might want to check
-+	   and be sure it's a valid file.  */
-+	struct ast_filestream *tmp;
-+	if ((tmp = malloc(sizeof(struct ast_filestream)))) {
-+		memset(tmp, 0, sizeof(struct ast_filestream));
-+		if (ast_mutex_lock(&g723_lock)) {
-+			ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+			free(tmp);
-+			return NULL;
-+		}
-+		tmp->fd = fd;
-+		glistcnt++;
-+		ast_mutex_unlock(&g723_lock);
-+		ast_update_use_count();
-+	} else
-+		ast_log(LOG_WARNING, "Out of memory\n");
-+	return tmp;
-+}
-+
-+static void g723_close(struct ast_filestream *s)
-+{
-+	if (ast_mutex_lock(&g723_lock)) {
-+		ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+		return;
-+	}
-+	glistcnt--;
-+	ast_mutex_unlock(&g723_lock);
-+	ast_update_use_count();
-+	close(s->fd);
-+	free(s);
-+	s = NULL;
-+}
-+
-+static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext)
-+{
-+	int res;
-+	/* Send a frame from the file to the appropriate channel */
-+	s->fr.frametype = AST_FRAME_VOICE;
-+	s->fr.subclass = AST_FORMAT_G723_1;
-+	s->fr.offset = AST_FRIENDLY_OFFSET;
-+	s->fr.samples = 240;
-+	s->fr.mallocd = 0;
-+	s->fr.data = s->g723;
-+	if ((res = read(s->fd, s->g723, 1)) != 1) {
-+		if (res)
-+			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
-+		return NULL;
-+	}
-+	s->fr.datalen = g723_len(s->g723[0]);
-+	if (s->fr.datalen < 0) {
-+		ast_log(LOG_WARNING, "Invalid G723.1 frame!\n");
-+		return NULL;
-+	}
-+	if (s->fr.datalen > 1 && (res = read(s->fd, s->g723 + 1, s->fr.datalen - 1)) != s->fr.datalen - 1) {
-+		if (res)
-+			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
-+		return NULL;
-+	}
-+	*whennext = s->fr.samples;
-+	return &s->fr;
-+}
-+
-+static int g723_write(struct ast_filestream *fs, struct ast_frame *f)
-+{
-+	int res;
-+	unsigned char *cp;
-+	if (f->frametype != AST_FRAME_VOICE) {
-+		ast_log(LOG_WARNING, "Asked to write non-voice frame!\n");
-+		return -1;
-+	}
-+	if (f->subclass != AST_FORMAT_G723_1) {
-+		ast_log(LOG_WARNING, "Asked to write non-G723.1 frame (%d)!\n", f->subclass);
-+		return -1;
-+	}
-+	for (cp = f->data; cp < (unsigned char *)f->data + f->datalen; cp += res) {
-+		res = g723_len(cp[0]);
-+		if (res < 0) {
-+			ast_log(LOG_WARNING, "Asked to write invalid G723.1 frame!\n");
-+			return -1;
-+		}
-+	}
-+	if (cp != (unsigned char *)f->data + f->datalen) {
-+		ast_log(LOG_WARNING, "Invalid G723.1 data length, %d\n", f->datalen);
-+		return -1;
-+	}
-+	if ((res = write(fs->fd, f->data, f->datalen)) != f->datalen) {
-+		ast_log(LOG_WARNING, "Bad write %d: %s\n", res, strerror(errno));
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static char *g723_getcomment(struct ast_filestream *s)
-+{
-+	return NULL;
-+}
-+
-+static int g723_seek(struct ast_filestream *fs, long sample_offset, int whence)
-+{
-+	long cur, offset, max;
-+	off_t coffset, moffset, soffset;
-+	int res;
-+	unsigned char c;
-+
-+	offset = 0;	/* Shut up gcc warning */
-+	if (whence == SEEK_SET) {
-+		offset = sample_offset;
-+	} else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) {
-+		if ((cur = g723_tell(fs)) == -1) {
-+			ast_log(LOG_WARNING, "Can't get current position!\n");
-+			return -1;
-+		}
-+		offset = cur + sample_offset;
-+	}
-+	if ((moffset = lseek(fs->fd, 0, SEEK_END)) == -1) {
-+		ast_log(LOG_WARNING, "Can't seek stream to an end!\n");
-+		return -1;
-+	}
-+	if (whence == SEEK_END) {
-+		if ((max = g723_tell(fs)) == -1) {
-+			ast_log(LOG_WARNING, "Can't get maximum position!\n");
-+			return -1;
-+		}
-+		offset = max - sample_offset;
-+	}
-+	if (offset < 0)
-+		offset = 0;
-+	soffset = -1;
-+	for (coffset = 0; coffset < moffset && offset > 0; coffset += res) {
-+		if (lseek(fs->fd, coffset, SEEK_SET) != coffset) {
-+			ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		if (read(fs->fd, &c, 1) != 1) {
-+			ast_log(LOG_WARNING, "Can't read from offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		soffset = coffset;
-+		if ((res = g723_len(c)) < 0) {
-+			ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		if (res > 1)
-+			offset -= 240;
-+	}
-+	if (soffset != -1 && lseek(fs->fd, soffset, SEEK_SET) != soffset) {
-+		ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", soffset);
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+static int g723_trunc(struct ast_filestream *fs)
-+{
-+	/* Truncate file to current length */
-+	if (ftruncate(fs->fd, lseek(fs->fd, 0, SEEK_CUR)) < 0)
-+		return -1;
-+	return 0;
-+}
-+
-+static long g723_tell(struct ast_filestream *fs)
-+{
-+	off_t offset, coffset;
-+	int res;
-+	long rval;
-+	unsigned char c;
-+
-+	offset = lseek(fs->fd, 0, SEEK_CUR);
-+	rval = 0;
-+	for (coffset = 0; coffset < offset; coffset += res) {
-+		if (lseek(fs->fd, coffset, SEEK_SET) != coffset) {
-+			ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if (read(fs->fd, &c, 1) != 1) {
-+			ast_log(LOG_WARNING, "Can't read from offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if ((res = g723_len(c)) < 0) {
-+			ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if (res > 1)
-+			rval += 240;
-+	}
-+	if (lseek(fs->fd, offset, SEEK_SET) != offset) {
-+		ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", offset);
-+		return -1;
-+	}
-+	return rval;
-+}
-+
-+int load_module()
-+{
-+	return ast_format_register(name, exts, AST_FORMAT_G723_1,
-+				   g723_open,
-+				   g723_rewrite,
-+				   g723_write,
-+				   g723_seek,
-+				   g723_trunc,
-+				   g723_tell,
-+				   g723_read,
-+				   g723_close,
-+				   g723_getcomment);
-+}
-+
-+int unload_module()
-+{
-+	return ast_format_unregister(name);
-+}
-+
-+int usecount()
-+{
-+	int res;
-+	if (ast_mutex_lock(&g723_lock)) {
-+		ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+		return -1;
-+	}
-+	res = glistcnt;
-+	ast_mutex_unlock(&g723_lock);
-+	return res;
-+}
-+
-+char *description()
-+{
-+	return desc;
-+}
-+
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk-devel/files/patch-formats::format_g729.c b/net/asterisk-devel/files/patch-formats::format_g729.c
deleted file mode 100644
index a144d1b0f6bf..000000000000
--- a/net/asterisk-devel/files/patch-formats::format_g729.c
+++ /dev/null
@@ -1,47 +0,0 @@
-
-$FreeBSD$
-
---- formats/format_g729.c.orig	Wed Jan 28 23:32:48 2004
-+++ formats/format_g729.c	Thu Feb 19 01:03:30 2004
-@@ -45,7 +45,7 @@
- 	struct ast_frame fr;				/* Frame information */
- 	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
- 	char empty;							/* Empty character */
--	unsigned char g729[20];				/* Two Real G729 Frames */
-+	unsigned char g729[10];				/* One Real G729 Frame */
- };
- 
- 
-@@ -126,11 +126,11 @@
- 	s->fr.frametype = AST_FRAME_VOICE;
- 	s->fr.subclass = AST_FORMAT_G729A;
- 	s->fr.offset = AST_FRIENDLY_OFFSET;
--	s->fr.samples = 160;
--	s->fr.datalen = 20;
-+	s->fr.samples = 80;
-+	s->fr.datalen = 10;
- 	s->fr.mallocd = 0;
- 	s->fr.data = s->g729;
--	if ((res = read(s->fd, s->g729, 20)) != 20) {
-+	if ((res = read(s->fd, s->g729, 10)) != 10) {
- 		if (res)
- 			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
- 		return NULL;
-@@ -174,7 +174,7 @@
- 	cur = lseek(fs->fd, 0, SEEK_CUR);
- 	max = lseek(fs->fd, 0, SEEK_END);
- 	
--	bytes = 20 * (sample_offset / 160);
-+	bytes = 10 * (sample_offset / 80);
- 	if (whence == SEEK_SET)
- 		offset = bytes;
- 	else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
-@@ -202,7 +202,7 @@
- {
- 	off_t offset;
- 	offset = lseek(fs->fd, 0, SEEK_CUR);
--	return (offset/20)*160;
-+	return (offset/10)*80;
- }
- 
- int load_module()
diff --git a/net/asterisk-devel/files/patch-pbx::Makefile b/net/asterisk-devel/files/patch-pbx::Makefile
deleted file mode 100644
index dca6672c389a..000000000000
--- a/net/asterisk-devel/files/patch-pbx::Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- pbx/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ pbx/Makefile	Fri Jan 30 01:47:34 2004
-@@ -16,7 +16,7 @@
- PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so     # pbx_gtkconsole.so pbx_kdeconsole.so
- 
- # Add GTK console if appropriate
--PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
-+#PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
- # Add KDE Console if appropriate
- #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so")
- 
-@@ -62,7 +62,7 @@
- endif
- 
- install: all
--	for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(PBX_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk-devel/files/patch-res::Makefile b/net/asterisk-devel/files/patch-res::Makefile
deleted file mode 100644
index ccd0a35dd59d..000000000000
--- a/net/asterisk-devel/files/patch-res::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- res/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ res/Makefile	Fri Jan 30 01:47:34 2004
-@@ -25,7 +25,7 @@
- all: depend $(MODS)
- 
- install: all
--	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- res_crypto.so: res_crypto.o
- 	$(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS)
diff --git a/net/asterisk-devel/pkg-descr b/net/asterisk-devel/pkg-descr
deleted file mode 100644
index 28b7a1deb011..000000000000
--- a/net/asterisk-devel/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
-sense, middleware between Internet and telephony channels on the bottom,
-and Internet and telephony applications at the top.
-
-WWW: http://www.asteriskpbx.com
diff --git a/net/asterisk-devel/pkg-plist b/net/asterisk-devel/pkg-plist
deleted file mode 100644
index ab3eff23ff6e..000000000000
--- a/net/asterisk-devel/pkg-plist
+++ /dev/null
@@ -1,462 +0,0 @@
-@unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi
-etc/asterisk/adsi.conf-dist
-@exec [ -f %B/adsi.conf ] || cp %B/%f %B/adsi.conf
-@unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi
-etc/asterisk/adtranvofr.conf-dist
-@exec [ -f %B/adtranvofr.conf ] || cp %B/%f %B/adtranvofr.conf
-@unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi
-etc/asterisk/agents.conf-dist
-@exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf
-@unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi
-etc/asterisk/alsa.conf-dist
-@exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf
-@unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi
-etc/asterisk/asterisk.adsi-dist
-@exec [ -f %B/asterisk.adsi ] || cp %B/%f %B/asterisk.adsi
-@unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi
-etc/asterisk/asterisk.conf-dist
-@exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf
-@unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi
-etc/asterisk/cdr_odbc.conf-dist
-@exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf
-@unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi
-etc/asterisk/cdr_pgsql.conf-dist
-@exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf
-@unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi
-etc/asterisk/enum.conf-dist
-@exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf
-@unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi
-etc/asterisk/extensions.conf-dist
-@exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf
-@unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
-etc/asterisk/festival.conf-dist
-@exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
-@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
-etc/asterisk/h323.conf-dist
-@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.conf
-@unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
-etc/asterisk/iax.conf-dist
-@exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
-@unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi
-etc/asterisk/indications.conf-dist
-@exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf
-@unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi
-etc/asterisk/logger.conf-dist
-@exec [ -f %B/logger.conf ] || cp %B/%f %B/logger.conf
-@unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi
-etc/asterisk/manager.conf-dist
-@exec [ -f %B/manager.conf ] || cp %B/%f %B/manager.conf
-@unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi
-etc/asterisk/meetme.conf-dist
-@exec [ -f %B/meetme.conf ] || cp %B/%f %B/meetme.conf
-@unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi
-etc/asterisk/mgcp.conf-dist
-@exec [ -f %B/mgcp.conf ] || cp %B/%f %B/mgcp.conf
-@unexec if cmp -s %D/etc/asterisk/modem.conf %D/etc/asterisk/modem.conf-dist; then rm -f %D/etc/asterisk/modem.conf; fi
-etc/asterisk/modem.conf-dist
-@exec [ -f %B/modem.conf ] || cp %B/%f %B/modem.conf
-@unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi
-etc/asterisk/modules.conf-dist
-@exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf
-@unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi
-etc/asterisk/musiconhold.conf-dist
-@exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf
-@unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi
-etc/asterisk/oss.conf-dist
-@exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf
-@unexec if cmp -s %D/etc/asterisk/parking.conf %D/etc/asterisk/parking.conf-dist; then rm -f %D/etc/asterisk/parking.conf; fi
-etc/asterisk/parking.conf-dist
-@exec [ -f %B/parking.conf ] || cp %B/%f %B/parking.conf
-@unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi
-etc/asterisk/phone.conf-dist
-@exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf
-@unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi
-etc/asterisk/privacy.conf-dist
-@exec [ -f %B/privacy.conf ] || cp %B/%f %B/privacy.conf
-@unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi
-etc/asterisk/queues.conf-dist
-@exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf
-@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi
-etc/asterisk/rpt.conf-dist
-@exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf
-@unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi
-etc/asterisk/rtp.conf-dist
-@exec [ -f %B/rtp.conf ] || cp %B/%f %B/rtp.conf
-@unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi
-etc/asterisk/sip.conf-dist
-@exec [ -f %B/sip.conf ] || cp %B/%f %B/sip.conf
-@unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi
-etc/asterisk/skinny.conf-dist
-@exec [ -f %B/skinny.conf ] || cp %B/%f %B/skinny.conf
-@unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi
-etc/asterisk/telcordia-1.adsi-dist
-@exec [ -f %B/telcordia-1.adsi ] || cp %B/%f %B/telcordia-1.adsi
-@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi
-etc/asterisk/voicemail.conf-dist
-@exec [ -f %B/voicemail.conf ] || cp %B/%f %B/voicemail.conf
-@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi
-etc/asterisk/vpb.conf-dist
-@exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf
-@unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi
-etc/asterisk/zapata.conf-dist
-@exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf
-include/asterisk/acl.h
-include/asterisk/adsi.h
-include/asterisk/aes.h
-include/asterisk/alaw.h
-include/asterisk/app.h
-include/asterisk/ast_expr.h
-include/asterisk/astdb.h
-include/asterisk/astmm.h
-include/asterisk/callerid.h
-include/asterisk/causes.h
-include/asterisk/cdr.h
-include/asterisk/channel.h
-include/asterisk/channel_pvt.h
-include/asterisk/chanvars.h
-include/asterisk/cli.h
-include/asterisk/config.h
-include/asterisk/crypto.h
-include/asterisk/cvsid.h
-include/asterisk/dlfcn-compat.h
-include/asterisk/dns.h
-include/asterisk/dsp.h
-include/asterisk/enum.h
-include/asterisk/file.h
-include/asterisk/frame.h
-include/asterisk/fskmodem.h
-include/asterisk/image.h
-include/asterisk/indications.h
-include/asterisk/io.h
-include/asterisk/linkedlists.h
-include/asterisk/localtime.h
-include/asterisk/lock.h
-include/asterisk/logger.h
-include/asterisk/manager.h
-include/asterisk/md5.h
-include/asterisk/module.h
-include/asterisk/monitor.h
-include/asterisk/musiconhold.h
-include/asterisk/options.h
-include/asterisk/parking.h
-include/asterisk/pbx.h
-include/asterisk/poll-compat.h
-include/asterisk/privacy.h
-include/asterisk/rtp.h
-include/asterisk/say.h
-include/asterisk/sched.h
-include/asterisk/srv.h
-include/asterisk/tdd.h
-include/asterisk/term.h
-include/asterisk/translate.h
-include/asterisk/ulaw.h
-include/asterisk/vmodem.h
-lib/asterisk/modules/app_adsiprog.so
-lib/asterisk/modules/app_agi.so
-lib/asterisk/modules/app_authenticate.so
-lib/asterisk/modules/app_cdr.so
-lib/asterisk/modules/app_chanisavail.so
-lib/asterisk/modules/app_cut.so
-lib/asterisk/modules/app_datetime.so
-lib/asterisk/modules/app_db.so
-lib/asterisk/modules/app_dial.so
-lib/asterisk/modules/app_directory.so
-lib/asterisk/modules/app_disa.so
-lib/asterisk/modules/app_echo.so
-lib/asterisk/modules/app_enumlookup.so
-lib/asterisk/modules/app_festival.so
-lib/asterisk/modules/app_getcpeid.so
-lib/asterisk/modules/app_hasnewvoicemail.so
-lib/asterisk/modules/app_image.so
-lib/asterisk/modules/app_intercom.so
-lib/asterisk/modules/app_lookupblacklist.so
-lib/asterisk/modules/app_lookupcidname.so
-lib/asterisk/modules/app_macro.so
-lib/asterisk/modules/app_milliwatt.so
-lib/asterisk/modules/app_mp3.so
-lib/asterisk/modules/app_parkandannounce.so
-lib/asterisk/modules/app_playback.so
-lib/asterisk/modules/app_privacy.so
-lib/asterisk/modules/app_qcall.so
-lib/asterisk/modules/app_queue.so
-lib/asterisk/modules/app_random.so
-lib/asterisk/modules/app_read.so
-lib/asterisk/modules/app_record.so
-lib/asterisk/modules/app_sayunixtime.so
-lib/asterisk/modules/app_senddtmf.so
-lib/asterisk/modules/app_setcallerid.so
-lib/asterisk/modules/app_setcdruserfield.so
-lib/asterisk/modules/app_setcidname.so
-lib/asterisk/modules/app_setcidnum.so
-lib/asterisk/modules/app_softhangup.so
-lib/asterisk/modules/app_striplsd.so
-lib/asterisk/modules/app_substring.so
-lib/asterisk/modules/app_system.so
-lib/asterisk/modules/app_transfer.so
-lib/asterisk/modules/app_url.so
-lib/asterisk/modules/app_voicemail.so
-lib/asterisk/modules/app_waitforring.so
-lib/asterisk/modules/app_zapateller.so
-lib/asterisk/modules/cdr_csv.so
-lib/asterisk/modules/chan_agent.so
-lib/asterisk/modules/chan_h323.so
-lib/asterisk/modules/chan_iax.so
-lib/asterisk/modules/chan_iax2.so
-lib/asterisk/modules/chan_local.so
-lib/asterisk/modules/chan_mgcp.so
-lib/asterisk/modules/chan_modem.so
-lib/asterisk/modules/chan_modem_aopen.so
-lib/asterisk/modules/chan_modem_bestdata.so
-lib/asterisk/modules/chan_modem_i4l.so
-lib/asterisk/modules/chan_oss.so
-lib/asterisk/modules/chan_sip.so
-lib/asterisk/modules/chan_skinny.so
-lib/asterisk/modules/codec_a_mu.so
-lib/asterisk/modules/codec_adpcm.so
-lib/asterisk/modules/codec_alaw.so
-lib/asterisk/modules/codec_g723_1_dummy.so
-lib/asterisk/modules/codec_g729_dummy.so
-lib/asterisk/modules/codec_gsm.so
-lib/asterisk/modules/codec_ilbc.so
-lib/asterisk/modules/codec_lpc10.so
-lib/asterisk/modules/codec_speex.so
-lib/asterisk/modules/codec_ulaw.so
-lib/asterisk/modules/format_g723_1.so
-lib/asterisk/modules/format_g729.so
-lib/asterisk/modules/format_gsm.so
-lib/asterisk/modules/format_h263.so
-lib/asterisk/modules/format_jpeg.so
-lib/asterisk/modules/format_pcm.so
-lib/asterisk/modules/format_pcm_alaw.so
-lib/asterisk/modules/format_vox.so
-lib/asterisk/modules/format_wav.so
-lib/asterisk/modules/format_wav_gsm.so
-lib/asterisk/modules/pbx_config.so
-lib/asterisk/modules/pbx_spool.so
-lib/asterisk/modules/pbx_wilcalu.so
-lib/asterisk/modules/res_adsi.so
-lib/asterisk/modules/res_crypto.so
-lib/asterisk/modules/res_indications.so
-lib/asterisk/modules/res_monitor.so
-lib/asterisk/modules/res_musiconhold.so
-lib/asterisk/modules/res_parking.so
-sbin/asterisk
-sbin/astgenkey
-sbin/safe_asterisk
-share/asterisk/agi-bin/agi-test.agi
-share/asterisk/agi-bin/eagi-sphinx-test
-share/asterisk/agi-bin/eagi-test
-share/asterisk/images/asterisk-intro.jpg
-share/asterisk/keys/iaxtel.pub
-share/asterisk/mohmp3/sample-hold.mp3
-share/asterisk/sounds/agent-alreadyon.gsm
-share/asterisk/sounds/agent-incorrect.gsm
-share/asterisk/sounds/agent-loggedoff.gsm
-share/asterisk/sounds/agent-loginok.gsm
-share/asterisk/sounds/agent-newlocation.gsm
-share/asterisk/sounds/agent-pass.gsm
-share/asterisk/sounds/agent-user.gsm
-share/asterisk/sounds/auth-incorrect.gsm
-share/asterisk/sounds/auth-thankyou.gsm
-share/asterisk/sounds/beep.gsm
-share/asterisk/sounds/conf-getchannel.gsm
-share/asterisk/sounds/conf-getconfno.gsm
-share/asterisk/sounds/conf-getpin.gsm
-share/asterisk/sounds/conf-invalid.gsm
-share/asterisk/sounds/conf-invalidpin.gsm
-share/asterisk/sounds/conf-onlyperson.gsm
-share/asterisk/sounds/demo-abouttotry.gsm
-share/asterisk/sounds/demo-congrats.gsm
-share/asterisk/sounds/demo-echodone.gsm
-share/asterisk/sounds/demo-echotest.gsm
-share/asterisk/sounds/demo-enterkeywords.gsm
-share/asterisk/sounds/demo-instruct.gsm
-share/asterisk/sounds/demo-moreinfo.gsm
-share/asterisk/sounds/demo-nogo.gsm
-share/asterisk/sounds/demo-nomatch.gsm
-share/asterisk/sounds/demo-thanks.gsm
-share/asterisk/sounds/digits/0.gsm
-share/asterisk/sounds/digits/1.gsm
-share/asterisk/sounds/digits/10.gsm
-share/asterisk/sounds/digits/11.gsm
-share/asterisk/sounds/digits/12.gsm
-share/asterisk/sounds/digits/13.gsm
-share/asterisk/sounds/digits/14.gsm
-share/asterisk/sounds/digits/15.gsm
-share/asterisk/sounds/digits/16.gsm
-share/asterisk/sounds/digits/17.gsm
-share/asterisk/sounds/digits/18.gsm
-share/asterisk/sounds/digits/19.gsm
-share/asterisk/sounds/digits/2.gsm
-share/asterisk/sounds/digits/20.gsm
-share/asterisk/sounds/digits/3.gsm
-share/asterisk/sounds/digits/30.gsm
-share/asterisk/sounds/digits/4.gsm
-share/asterisk/sounds/digits/40.gsm
-share/asterisk/sounds/digits/5.gsm
-share/asterisk/sounds/digits/50.gsm
-share/asterisk/sounds/digits/6.gsm
-share/asterisk/sounds/digits/60.gsm
-share/asterisk/sounds/digits/7.gsm
-share/asterisk/sounds/digits/70.gsm
-share/asterisk/sounds/digits/8.gsm
-share/asterisk/sounds/digits/80.gsm
-share/asterisk/sounds/digits/9.gsm
-share/asterisk/sounds/digits/90.gsm
-share/asterisk/sounds/digits/a-m.gsm
-share/asterisk/sounds/digits/at.gsm
-share/asterisk/sounds/digits/day-0.gsm
-share/asterisk/sounds/digits/day-1.gsm
-share/asterisk/sounds/digits/day-2.gsm
-share/asterisk/sounds/digits/day-3.gsm
-share/asterisk/sounds/digits/day-4.gsm
-share/asterisk/sounds/digits/day-5.gsm
-share/asterisk/sounds/digits/day-6.gsm
-share/asterisk/sounds/digits/dollars.gsm
-share/asterisk/sounds/digits/h-1.gsm
-share/asterisk/sounds/digits/h-10.gsm
-share/asterisk/sounds/digits/h-11.gsm
-share/asterisk/sounds/digits/h-12.gsm
-share/asterisk/sounds/digits/h-13.gsm
-share/asterisk/sounds/digits/h-14.gsm
-share/asterisk/sounds/digits/h-15.gsm
-share/asterisk/sounds/digits/h-16.gsm
-share/asterisk/sounds/digits/h-17.gsm
-share/asterisk/sounds/digits/h-18.gsm
-share/asterisk/sounds/digits/h-19.gsm
-share/asterisk/sounds/digits/h-2.gsm
-share/asterisk/sounds/digits/h-20.gsm
-share/asterisk/sounds/digits/h-3.gsm
-share/asterisk/sounds/digits/h-30.gsm
-share/asterisk/sounds/digits/h-4.gsm
-share/asterisk/sounds/digits/h-5.gsm
-share/asterisk/sounds/digits/h-6.gsm
-share/asterisk/sounds/digits/h-7.gsm
-share/asterisk/sounds/digits/h-8.gsm
-share/asterisk/sounds/digits/h-9.gsm
-share/asterisk/sounds/digits/hundred.gsm
-share/asterisk/sounds/digits/million.gsm
-share/asterisk/sounds/digits/mon-0.gsm
-share/asterisk/sounds/digits/mon-1.gsm
-share/asterisk/sounds/digits/mon-10.gsm
-share/asterisk/sounds/digits/mon-11.gsm
-share/asterisk/sounds/digits/mon-2.gsm
-share/asterisk/sounds/digits/mon-3.gsm
-share/asterisk/sounds/digits/mon-4.gsm
-share/asterisk/sounds/digits/mon-5.gsm
-share/asterisk/sounds/digits/mon-6.gsm
-share/asterisk/sounds/digits/mon-7.gsm
-share/asterisk/sounds/digits/mon-8.gsm
-share/asterisk/sounds/digits/mon-9.gsm
-share/asterisk/sounds/digits/oclock.gsm
-share/asterisk/sounds/digits/oh.gsm
-share/asterisk/sounds/digits/p-m.gsm
-share/asterisk/sounds/digits/pound.gsm
-share/asterisk/sounds/digits/star.gsm
-share/asterisk/sounds/digits/thousand.gsm
-share/asterisk/sounds/digits/today.gsm
-share/asterisk/sounds/digits/tomorrow.gsm
-share/asterisk/sounds/digits/yesterday.gsm
-share/asterisk/sounds/dir-instr.gsm
-share/asterisk/sounds/dir-intro.gsm
-share/asterisk/sounds/dir-nomatch.gsm
-share/asterisk/sounds/dir-nomore.gsm
-share/asterisk/sounds/invalid.gsm
-share/asterisk/sounds/pbx-invalid.gsm
-share/asterisk/sounds/pbx-invalidpark.gsm
-share/asterisk/sounds/pbx-transfer.gsm
-share/asterisk/sounds/privacy-incorrect.gsm
-share/asterisk/sounds/privacy-prompt.gsm
-share/asterisk/sounds/privacy-thankyou.gsm
-share/asterisk/sounds/privacy-unident.gsm
-share/asterisk/sounds/ss-noservice.gsm
-share/asterisk/sounds/transfer.gsm
-share/asterisk/sounds/tt-allbusy.gsm
-share/asterisk/sounds/tt-monkeys.gsm
-share/asterisk/sounds/tt-monkeysintro.gsm
-share/asterisk/sounds/tt-somethingwrong.gsm
-share/asterisk/sounds/tt-weasels.gsm
-share/asterisk/sounds/vm
-share/asterisk/sounds/vm-Family.gsm
-share/asterisk/sounds/vm-Friends.gsm
-share/asterisk/sounds/vm-INBOX.gsm
-share/asterisk/sounds/vm-Old.gsm
-share/asterisk/sounds/vm-Work.gsm
-share/asterisk/sounds/vm-and.gsm
-share/asterisk/sounds/vm-changeto.gsm
-share/asterisk/sounds/vm-delete.gsm
-share/asterisk/sounds/vm-deleted.gsm
-share/asterisk/sounds/vm-extension.gsm
-share/asterisk/sounds/vm-first.gsm
-share/asterisk/sounds/vm-for.gsm
-share/asterisk/sounds/vm-forwardoptions.gsm
-share/asterisk/sounds/vm-goodbye.gsm
-share/asterisk/sounds/vm-helpexit.gsm
-share/asterisk/sounds/vm-incorrect.gsm
-share/asterisk/sounds/vm-instructions.gsm
-share/asterisk/sounds/vm-intro.gsm
-share/asterisk/sounds/vm-isonphone.gsm
-share/asterisk/sounds/vm-isunavail.gsm
-share/asterisk/sounds/vm-last.gsm
-share/asterisk/sounds/vm-login.gsm
-share/asterisk/sounds/vm-mailboxfull.gsm
-share/asterisk/sounds/vm-message.gsm
-share/asterisk/sounds/vm-messages.gsm
-share/asterisk/sounds/vm-mismatch.gsm
-share/asterisk/sounds/vm-msginstruct.gsm
-share/asterisk/sounds/vm-msgsaved.gsm
-share/asterisk/sounds/vm-newpassword.gsm
-share/asterisk/sounds/vm-next.gsm
-share/asterisk/sounds/vm-no.gsm
-share/asterisk/sounds/vm-nobodyavail.gsm
-share/asterisk/sounds/vm-nomore.gsm
-share/asterisk/sounds/vm-onefor.gsm
-share/asterisk/sounds/vm-options.gsm
-share/asterisk/sounds/vm-opts.gsm
-share/asterisk/sounds/vm-passchanged.gsm
-share/asterisk/sounds/vm-password.gsm
-share/asterisk/sounds/vm-press.gsm
-share/asterisk/sounds/vm-prev.gsm
-share/asterisk/sounds/vm-rec-busy.gsm
-share/asterisk/sounds/vm-rec-name.gsm
-share/asterisk/sounds/vm-rec-unv.gsm
-share/asterisk/sounds/vm-received.gsm
-share/asterisk/sounds/vm-reenterpassword.gsm
-share/asterisk/sounds/vm-repeat.gsm
-share/asterisk/sounds/vm-saved.gsm
-share/asterisk/sounds/vm-savedto.gsm
-share/asterisk/sounds/vm-savefolder.gsm
-share/asterisk/sounds/vm-savemessage.gsm
-share/asterisk/sounds/vm-sorry.gsm
-share/asterisk/sounds/vm-theperson.gsm
-share/asterisk/sounds/vm-tocancel.gsm
-share/asterisk/sounds/vm-toforward.gsm
-share/asterisk/sounds/vm-undelete.gsm
-share/asterisk/sounds/vm-undeleted.gsm
-share/asterisk/sounds/vm-whichbox.gsm
-share/asterisk/sounds/vm-youhave.gsm
-share/asterisk/sounds/voicemail
-@dirrm share/asterisk/sounds/digits
-@dirrm share/asterisk/sounds
-@dirrm share/asterisk/mohmp3
-@dirrm share/asterisk/keys
-@dirrm share/asterisk/images
-@dirrm share/asterisk/agi-bin
-@dirrm share/asterisk
-@dirrm lib/asterisk/modules
-@dirrm lib/asterisk
-@dirrm include/asterisk
-@dirrm etc/asterisk
-@cwd /var
-spool/asterisk/vm
-spool/asterisk/voicemail/default/1234/busy.gsm
-spool/asterisk/voicemail/default/1234/unavail.gsm
-@exec mkdir -p %D/log/asterisk/cdr-csv
-@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX
-@dirrm spool/asterisk/voicemail/default/1234/INBOX
-@dirrm spool/asterisk/voicemail/default/1234
-@dirrm spool/asterisk/voicemail/default
-@dirrm spool/asterisk/voicemail
-@dirrm spool/asterisk
-@dirrm log/asterisk/cdr-csv
-@dirrm log/asterisk
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
deleted file mode 100644
index 82db2899e80a..000000000000
--- a/net/asterisk10/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for:	asterisk
-# Date created:				17 October 2003
-# Whom:					Maxim Sobolev <sobomax@portaone.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	asterisk
-PORTVERSION=	0.7.2
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
-		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
-
-MAINTAINER=	sobomax@FreeBSD.org
-COMMENT=	An Open Source PBX and telephony toolkit
-
-FORBIDDEN=	http://people.freebsd.org/~eik/portaudit/27c331d5-64c7-11d8-80e3-0020ed76ef5a.html
-
-ONLY_FOR_ARCHS=	i386
-
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
-		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
-LIB_DEPENDS=	speex.2:${PORTSDIR}/audio/speex
-RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
-
-GNU_CONFIGURE=	yes
-CONFIGURE_WRKSRC=	${WRKSRC}/editline
-USE_GMAKE=	yes
-USE_OPENLDAP=	yes
-MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		MKDIR="${MKDIR}" \
-		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \
-		OSVERSION=${OSVERSION} \
-		CXX="${CXX}"
-
-.include <bsd.port.mk>
diff --git a/net/asterisk10/distinfo b/net/asterisk10/distinfo
deleted file mode 100644
index 13e376bb0fae..000000000000
--- a/net/asterisk10/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (asterisk-0.7.2.tar.gz) = a1f9485f5f85a4e4129782b6e642e236
-SIZE (asterisk-0.7.2.tar.gz) = 2779788
diff --git a/net/asterisk10/files/patch-Makefile b/net/asterisk10/files/patch-Makefile
deleted file mode 100644
index 1e4ffbe62070..000000000000
--- a/net/asterisk10/files/patch-Makefile
+++ /dev/null
@@ -1,301 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig	Wed Jan 14 08:48:38 2004
-+++ Makefile	Fri Jan 30 02:25:09 2004
-@@ -43,10 +43,10 @@
- #K6OPT  = -DK6OPT
- 
- #Tell gcc to optimize the asterisk's code
--OPTIMIZE=-O6
-+#OPTIMIZE=-O6
- 
- #Include debug symbols in the executables (-g) and profiling info (-pg)
--DEBUG=-g #-pg
-+#DEBUG=-g #-pg
- 
- # New hangup routines for chan_zap.c
- # If this flag is uncommented then you need to have new libpri code in your system
-@@ -68,7 +68,7 @@
- 
- # Where to install asterisk after compiling
- # Default -> leave empty
--INSTALL_PREFIX=
-+INSTALL_PREFIX=$(PREFIX)
- 
- # Staging directory
- # Files are copied here temporarily during the install process
-@@ -88,28 +88,26 @@
- # Don't use together with -DBUSYDETECT_TONEONLY
- BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
- 
--ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
--ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
-+ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk
-+ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk
- ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
--ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
--ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
--ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
-+ASTSPOOLDIR=/var/spool/asterisk
-+ASTLOGDIR=/var/log/asterisk
-+ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk
- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
--ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
--ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
--ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
-+ASTBINDIR=$(INSTALL_PREFIX)/bin
-+ASTSBINDIR=$(INSTALL_PREFIX)/sbin
-+ASTVARRUNDIR=/var/run
- 
- MODULES_DIR=$(ASTLIBDIR)/modules
- AGI_DIR=$(ASTVARLIBDIR)/agi-bin
- 
- INCLUDE=-Iinclude -I../include
--CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
- CFLAGS+=$(OPTIMIZE)
--CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- ifeq (${OSARCH},FreeBSD)
--CFLAGS+=-pthread
--INCLUDE+=-I/usr/local/include
-+CFLAGS+=$(PTHREAD_CFLAGS)
- endif
- ifeq (${OSARCH},OpenBSD)
- CFLAGS+=-pthread
-@@ -151,7 +149,7 @@
- LIBS=-pthread
- else
- ifeq (${OSARCH},FreeBSD)
--LIBS=-pthread
-+LIBS=$(PTHREAD_LIBS)
- else
- endif
- endif
-@@ -179,7 +177,7 @@
- SOLINK=-shared -Xlinker -x
- endif
- 
--CC=gcc
-+CC?=gcc
- INSTALL=install
- 
- _all: all
-@@ -200,13 +198,13 @@
- 	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
- 	$(MAKE) -C editline libedit.a
- 
--db1-ast/libdb1.a: FORCE
--	@if [ -d db1-ast ]; then \
--		$(MAKE) -C db1-ast libdb1.a ; \
--	else \
--		echo "You need to do a cvs update -d not just cvs update"; \
--		exit 1; \
--	fi
-+#db1-ast/libdb1.a: FORCE
-+#	@if [ -d db1-ast ]; then \
-+#		$(MAKE) -C db1-ast libdb1.a ; \
-+#	else \
-+#		echo "You need to do a cvs update -d not just cvs update"; \
-+#		exit 1; \
-+#	fi
- 
- ifneq ($(wildcard .depend),)
- include .depend
-@@ -244,8 +242,8 @@
- 		exit 1; \
- 	fi
- 
--asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
--	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a
-+asterisk: editline/libedit.a stdtime/libtime.a $(OBJS)
-+	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) stdtime/libtime.a
- 
- subdirs: 
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
-@@ -260,10 +258,10 @@
- 	$(MAKE) -C stdtime clean
- 
- datafiles: all
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
- 	for x in sounds/digits/*.gsm; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
-@@ -271,18 +269,18 @@
- 	done
- 	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-*; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
- 		fi; \
- 	done
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/images
- 	for x in images/*.jpg; do \
--		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
- 	done
--	mkdir -p $(DESTDIR)$(AGI_DIR)
-+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
- 
- update: 
- 	@if [ -d CVS ]; then \
-@@ -294,105 +292,74 @@
- 	fi
- 
- bininstall: all
--	mkdir -p $(DESTDIR)$(MODULES_DIR)
--	mkdir -p $(DESTDIR)$(ASTSBINDIR)
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	mkdir -p $(DESTDIR)$(ASTBINDIR)
--	mkdir -p $(DESTDIR)$(ASTSBINDIR)
--	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
--	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
--	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
-+	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
-+	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
- 	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
--		install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
-+		$(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
- 	fi
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
--	install -d $(DESTDIR)$(ASTHEADERDIR)
--	install -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
-+	$(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
- 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm
--	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail
--	if [ ! -h $(DESTDIR)$(ASTSPOOLDIR)/vm ] && [ -d $(DESTDIR)$(ASTSPOOLDIR)/vm ]; then \
--		mv $(DESTDIR)$(ASTSPOOLDIR)/vm $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \
--	else \
--		mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \
--		rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \
--	fi
--	ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_ixj.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_tor.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_mysql.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_unixodbc.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/codec_mp3_d.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/format_mp3.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/app_voicemail2.so
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
--	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
--	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
--	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/vm . )
--	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
--	@echo " +---- Asterisk Installation Complete -------+"  
--	@echo " +                                           +"
--	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
--	@echo " +                                           +"
--	@echo " + Asterisk has successfully been installed. +"  
--	@echo " + If you would like to install the sample   +"  
--	@echo " + configuration files (overwriting any      +"
--	@echo " + existing config files), run:              +"  
--	@echo " +                                           +"
--	@echo " +               $(MAKE) samples                +"
--	@echo " +                                           +"
--	@echo " +-----------------  or ---------------------+"
--	@echo " +                                           +"
--	@echo " + You can go ahead and install the asterisk +"
--	@echo " + program documentation now or later run:   +"
--	@echo " +                                           +"
--	@echo " +              $(MAKE) progdocs                +"
--	@echo " +                                           +"
--	@echo " + **Note** This requires that you have      +"
--	@echo " + doxygen installed on your local system    +"
--	@echo " +-------------------------------------------+"
-+	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/vm . )
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/voicemail . )
- 
--install: all datafiles bininstall
-+install: all datafiles bininstall samples
- 
- upgrade: all bininstall
- 
- adsi: all
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
- 	for x in configs/*.adsi; do \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x`-dist; \
- 		if ! [ -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \
--			install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
- 		fi ; \
- 	done
- 
- samples: all datafiles adsi
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	for x in configs/*.sample; do \
--		if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
--			mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	for x in configs/*.sample channels/h323/*.sample; do \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\
-+		if ! [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
- 		fi ; \
--		install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
- 	done
--	echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
-+	echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	if ! [ -f $(DESTDIR)$(ASTETCDIR)/asterisk.conf ]; then \
-+		$(BSD_INSTALL_DATA) $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist $(DESTDIR)$(ASTETCDIR)/asterisk.conf; \
-+	fi
- 	for x in sounds/demo-*; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
- 		fi; \
- 	done
- 	for x in sounds/*.mp3; do \
--		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
- 	done
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
- 	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
- 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
- 		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
diff --git a/net/asterisk10/files/patch-agi::Makefile b/net/asterisk10/files/patch-agi::Makefile
deleted file mode 100644
index 567c30f5624e..000000000000
--- a/net/asterisk10/files/patch-agi::Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-
-$FreeBSD$
-
---- agi/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ agi/Makefile	Fri Jan 30 02:31:07 2004
-@@ -11,21 +11,24 @@
- # the GNU General Public License
- #
- 
--AGIS=agi-test.agi eagi-test eagi-sphinx-test
-+AGIS_BIN=eagi-test eagi-sphinx-test
-+AGIS_SCR=agi-test.agi
-+AGIS=$(AGIS_SCR) $(AGIS_BIN)
- 
- CFLAGS+=
- 
- all: depend $(AGIS)
- 
- install: all
--	mkdir -p $(DESTDIR)$(AGI_DIR)
--	for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
-+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
-+	for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done
-+	for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
- 
- eagi-test: eagi-test.o
--	$(CC) -o eagi-test eagi-test.o
-+	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
- 	
- eagi-sphinx-test: eagi-sphinx-test.o
--	$(CC) -o eagi-sphinx-test eagi-sphinx-test.o
-+	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o
- 
- clean:
- 	rm -f *.so *.o look .depend
diff --git a/net/asterisk10/files/patch-apps::Makefile b/net/asterisk10/files/patch-apps::Makefile
deleted file mode 100644
index 901ba694c33a..000000000000
--- a/net/asterisk10/files/patch-apps::Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- apps/Makefile.orig	Mon Jan 12 03:56:38 2004
-+++ apps/Makefile	Fri Jan 30 01:47:34 2004
-@@ -59,17 +59,17 @@
- 	$(CC) $(SOLINK) -o $@ $< -ltonezone
- 
- install: all
--	for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- app_todd.o: app_todd.c
--	gcc -pipe -O6 -g  -Iinclude -I../include -D_REENTRANT -march=i586 -DDO_CRASH -c -o  app_todd.o app_todd.c
-+	$(CC) $(CFLAGS) -Iinclude -I../include -D_REENTRANT -DDO_CRASH -c -o  app_todd.o app_todd.c
- 
- app_todd.so: app_todd.o
--	$(CC) $(SOLINK) -o $@ $< -L/usr/local/ssl/lib -lssl -lcrypto
-+	$(CC) $(SOLINK) -o $@ $< -lssl -lcrypto
- 
- app_voicemail.so : app_voicemail.o
- ifeq ($(USE_MYSQL_VM_INTERFACE),1)
--	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient -lz
-+	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L$(LOCALBASE)/lib/mysql -lmysqlclient -lz
- else
- ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
- 	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq
-@@ -88,7 +88,7 @@
- 	$(CC) $(SOLINK) -o $@ $< -lodbc
- 
- look:	look.c
--	gcc -pipe -O6 -g look.c -o look -lncurses
-+	$(CC) $(CFLAGS) look.c -o look -lncurses
- 
- ifneq ($(wildcard .depend),)
- include .depend
diff --git a/net/asterisk10/files/patch-apps::app_intercom.c b/net/asterisk10/files/patch-apps::app_intercom.c
deleted file mode 100644
index e4ac57f8e31b..000000000000
--- a/net/asterisk10/files/patch-apps::app_intercom.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- apps/app_intercom.c.orig	Wed Oct 22 06:10:24 2003
-+++ apps/app_intercom.c	Fri Jan 30 01:52:03 2004
-@@ -29,7 +29,7 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk10/files/patch-astman::Makefile b/net/asterisk10/files/patch-astman::Makefile
deleted file mode 100644
index cf31005257cf..000000000000
--- a/net/asterisk10/files/patch-astman::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- astman/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ astman/Makefile	Fri Jan 30 01:47:34 2004
-@@ -8,7 +8,7 @@
- install:
- 	if [ "$(TARGET)" != "none" ]; then \
- 		for x in $(TARGET); do \
--			install -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/astman; \
-+			$(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/astman; \
- 		done ; \
- 	fi
- 
diff --git a/net/asterisk10/files/patch-cdr::Makefile b/net/asterisk10/files/patch-cdr::Makefile
deleted file mode 100644
index 2ede608f9019..000000000000
--- a/net/asterisk10/files/patch-cdr::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- cdr/Makefile.orig	Sun Jan 11 21:17:02 2004
-+++ cdr/Makefile	Fri Jan 30 01:47:34 2004
-@@ -43,7 +43,7 @@
- all: depend $(MODS)
- 
- install: all
--	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- clean:
- 	rm -f *.so *.o .depend
diff --git a/net/asterisk10/files/patch-channels::Makefile b/net/asterisk10/files/patch-channels::Makefile
deleted file mode 100644
index d05ee2c13676..000000000000
--- a/net/asterisk10/files/patch-channels::Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-
-$FreeBSD$
-
---- channels/Makefile.orig	Fri Jan 23 22:57:48 2004
-+++ channels/Makefile	Thu Feb 19 01:48:41 2004
-@@ -26,12 +26,10 @@
- #
- #CHANNEL_LIBS+=chan_vofr
- 
--ifneq (${OSARCH},Darwin)
- CHANNEL_LIBS+=chan_oss.so
--endif
- 
- CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
--CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
-+CHANNEL_LIBS+=chan_h323.so
- 
- CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
- CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
-@@ -99,10 +97,8 @@
- 
- chan_oss.o: chan_oss.c  busy.h ringtone.h
- 
--ifeq (${OSARCH},OpenBSD)
- chan_oss.so: chan_oss.o
--	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
--endif
-+	$(CC) $(SOLINK) -o $@ chan_oss.o
- 
- chan_iax2.so: chan_iax2.o iax2-parser.o
- ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -146,15 +142,17 @@
- chan_vpb.so: chan_vpb.o
- 	 $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl
- 
--chan_h323.so: chan_h323.o h323/libchanh323.a
--	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+chan_h323.so: chan_h323.o h323/ast_h323.o
-+	$(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
- 
-+h323/ast_h323.o:
-+	$(MAKE) -C h323 ast_h323.o
- 
- #chan_modem.so : chan_modem.o
- #	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<
- 
- install: all
--	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk10/files/patch-channels::chan_h323.c b/net/asterisk10/files/patch-channels::chan_h323.c
deleted file mode 100644
index e413bd8ecec8..000000000000
--- a/net/asterisk10/files/patch-channels::chan_h323.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_h323.c.orig	Tue Jan 13 11:24:26 2004
-+++ channels/chan_h323.c	Fri Jan 30 01:47:34 2004
-@@ -54,6 +54,7 @@
- #include <fcntl.h>
- #include <netdb.h>
- #include <sys/signal.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- 
- 
diff --git a/net/asterisk10/files/patch-channels::chan_oss.c b/net/asterisk10/files/patch-channels::chan_oss.c
deleted file mode 100644
index 1006b377874e..000000000000
--- a/net/asterisk10/files/patch-channels::chan_oss.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_oss.c.orig	Wed Oct 22 06:10:34 2003
-+++ channels/chan_oss.c	Fri Jan 30 01:50:35 2004
-@@ -36,7 +36,7 @@
- #ifdef __linux
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk10/files/patch-channels::h323::Makefile b/net/asterisk10/files/patch-channels::h323::Makefile
deleted file mode 100644
index a9159b4441c1..000000000000
--- a/net/asterisk10/files/patch-channels::h323::Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-
-$FreeBSD$
-
---- channels/h323/Makefile.orig	Sun Jan 11 04:22:32 2004
-+++ channels/h323/Makefile	Fri Jan 30 01:47:34 2004
-@@ -19,7 +19,7 @@
- #
- # This needs to be updated to deal with more than just little endian machines
- #
--CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
-+CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
- 
- 
- #############################################
-@@ -27,38 +27,39 @@
- # Only change below if you know WTF your doing
- #
- CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
--CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
--CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
-+CFLAGS += -Wall -fPIC
-+CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
- CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
- CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
- CFLAGS += -I../../include
- CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
--CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
-+CFLAGS += -I$(OPENH323DIR)/include
- 
- 
- all:   	libchanh323.a
- 
- samples: 
--	if [ -f $(ASTETCDIR)/h323.conf ]; then \
--		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
-+	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
-+	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
-+		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
- 	fi ; 
--	install h323.conf.sample $(ASTETCDIR)/h323.conf
-  
- 
- ast_h323.o:	ast_h323.cpp
--	g++ -g -c -o $@ $(CFLAGS) $<
-+	$(CXX) -c -o $@ $(CFLAGS) $<
- 
- libchanh323.a:	ast_h323.o
- 	ar cr libchanh323.a ast_h323.o
- 
- chan_h323.so:	
--	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
- 
- chan_h323_d.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
- 
- chan_h323_s.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
-+
- clean:
- 	rm -f *.o *.so core.* libchanh323.a
- 
diff --git a/net/asterisk10/files/patch-codecs::Makefile b/net/asterisk10/files/patch-codecs::Makefile
deleted file mode 100644
index b802dc1233e8..000000000000
--- a/net/asterisk10/files/patch-codecs::Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-
-$FreeBSD$
-
---- codecs/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ codecs/Makefile	Fri Jan 30 01:47:34 2004
-@@ -17,23 +17,22 @@
- # g723.1b)
- #
- #MODG723=codec_g723_1.so codec_g723_1b.so
--MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
--MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
--MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
-+MODG723=codec_g723_1_dummy.so
-+MODG729=codec_g729_dummy.so
-+MODSPEEX=codec_speex.so
- MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
--CFLAGS+=-fPIC
--CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
-+CFLAGS+=-fPIC -I$(LOCALBASE)/include
- 
- LIBG723=g723.1/libg723.a
- LIBG723B=g723.1b/libg723b.a
- LIBGSM=gsm/lib/libgsm.a
- LIBGSMT=gsm/lib/libgsm.a
- LIBLPC10=lpc10/liblpc10.a
--LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib")
-+LIBSPEEX=-L$(LOCALBASE)/lib
- LIBSPEEX+=-lspeex -lm
- LIBILBC=ilbc/libilbc.a
- 
--CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-+CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so
- 
- all: depend $(CODECS)
-@@ -88,7 +87,7 @@
- include .depend
- 
- install: all
--	for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(CODECS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk10/files/patch-codecs::codec_g723_1_dummy.c b/net/asterisk10/files/patch-codecs::codec_g723_1_dummy.c
deleted file mode 100644
index 661ff2d88602..000000000000
--- a/net/asterisk10/files/patch-codecs::codec_g723_1_dummy.c
+++ /dev/null
@@ -1,314 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g723_1_dummy.c	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,308 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Translate between signed linear and G.723.1 (dummy!)
-+ *
-+ * The G.723.1 code is not included in the Asterisk distribution because
-+ * it is covered with patents, and in spite of statements to the contrary,
-+ * the "technology" is extremely expensive to license.
-+ * 
-+ * Copyright (C) 1999, Mark Spencer
-+ *
-+ * Mark Spencer <markster@linux-support.net>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#define TYPE_HIGH	 0x0
-+#define TYPE_LOW	 0x1
-+#define TYPE_SILENCE	 0x2
-+#define TYPE_DONTSEND	 0x3
-+#define TYPE_MASK	 0x3
-+
-+#include <sys/types.h>
-+#include <asterisk/translate.h>
-+#include <asterisk/module.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/channel.h>
-+#include <pthread.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <netinet/in.h>
-+#include <string.h>
-+#include <stdio.h>
-+
-+/* Sample frame data */
-+#include "slin_g723_ex.h"
-+#include "g723_slin_ex.h"
-+
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
-+static int localusecnt=0;
-+
-+static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator";
-+
-+struct g723_encoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Buffer for our outgoing frame */
-+	char outbuf[8000];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+struct g723_decoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+static struct ast_translator_pvt *g723tolin_new()
-+{
-+	struct g723_decoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g723_decoder_pvt));
-+	if (tmp) {
-+		tmp->tail = 0;
-+		localusecnt++;
-+		ast_update_use_count();
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *lintog723_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_SLINEAR;
-+	f.datalen = sizeof(slin_g723_ex);
-+	/* Assume 8000 Hz */
-+	f.samples = sizeof(slin_g723_ex)/16;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = slin_g723_ex;
-+	return &f;
-+}
-+
-+static struct ast_frame *g723tolin_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_G723_1;
-+	f.datalen = sizeof(g723_slin_ex);
-+	/* All frames are 30 ms long */
-+	f.samples = 30;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = g723_slin_ex;
-+	return &f;
-+}
-+
-+static struct ast_translator_pvt *lintog723_new()
-+{
-+	struct g723_encoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g723_encoder_pvt));
-+	if (tmp) {
-+		localusecnt++;
-+		ast_update_use_count();
-+		tmp->tail = 0;
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *g723tolin_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt;
-+	if (!tmp->tail)
-+		return NULL;
-+	/* Signed linear is no particular frame size, so just send whatever
-+	   we have in the buffer in one lump sum */
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_SLINEAR;
-+	tmp->f.datalen = tmp->tail * 2;
-+	/* Assume 8000 Hz */
-+	tmp->f.samples = tmp->tail / 8;
-+	tmp->f.mallocd = 0;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.data = tmp->buf;
-+	/* Reset tail pointer */
-+	tmp->tail = 0;
-+
-+	return &tmp->f;	
-+}
-+
-+static int g723_len(unsigned char buf)
-+{
-+	switch(buf & TYPE_MASK) {
-+	case TYPE_DONTSEND:
-+		return 2;
-+		break;
-+	case TYPE_SILENCE:
-+		return 4;
-+		break;
-+	case TYPE_HIGH:
-+		return 24;
-+		break;
-+	case TYPE_LOW:
-+		return 20;
-+		break;
-+	default:
-+		ast_log(LOG_WARNING, "Badly encoded frame (%d)\n", buf & TYPE_MASK);
-+	}
-+	return -1;
-+}
-+
-+static int g723tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt;
-+	int len = 0;
-+	int res;
-+	while(len < f->datalen) {
-+		/* Assuming there's space left, decode into the current buffer at
-+		   the tail location */
-+		res = g723_len(((unsigned char *)f->data + len)[0]);
-+		if (res < 0) {
-+			ast_log(LOG_WARNING, "Invalid data\n");
-+			return -1;
-+		}
-+		if (res + len > f->datalen) {
-+			ast_log(LOG_WARNING, "Measured length exceeds frame length\n");
-+			return -1;
-+		}
-+		if (tmp->tail + 480 < sizeof(tmp->buf)/2) {	
-+			memset(tmp->buf + tmp->tail, 0, 480);
-+			tmp->tail+=480;
-+		} else {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return -1;
-+		}
-+		len += res;
-+	}
-+	return 0;
-+}
-+
-+static int lintog723_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	/* Just add the frames to our stream */
-+	/* XXX We should look at how old the rest of our stream is, and if it
-+	   is too old, then we should overwrite it entirely, otherwise we can
-+	   get artifacts of earlier talk that do not belong */
-+	struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt;
-+	if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) {
-+		memcpy(&tmp->buf[tmp->tail], f->data, f->datalen);
-+		tmp->tail += f->datalen/2;
-+	} else {
-+		ast_log(LOG_WARNING, "Out of buffer space\n");
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static struct ast_frame *lintog723_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt;
-+	int cnt=0;
-+	/* We can't work on anything less than a frame in size */
-+	if (tmp->tail < 480)
-+		return NULL;
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_G723_1;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.samples = 0;
-+	tmp->f.mallocd = 0;
-+	while(tmp->tail >= 480) {
-+		/* Encode a frame of data */
-+		if (cnt + 24 >= sizeof(tmp->outbuf)) {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return NULL;
-+		}
-+		memset(tmp->outbuf + cnt, 0, 24);
-+		/* Assume 8000 Hz */
-+		tmp->f.samples += 30;
-+		cnt += 24;
-+		tmp->tail -= 480;
-+		/* Move the data at the end of the buffer to the front */
-+		if (tmp->tail)
-+			memmove(tmp->buf, tmp->buf + 480, tmp->tail * 2);
-+	}
-+	tmp->f.datalen = cnt;
-+	tmp->f.data = tmp->outbuf;
-+	return &tmp->f;	
-+}
-+
-+static void g723_destroy(struct ast_translator_pvt *pvt)
-+{
-+	free(pvt);
-+	localusecnt--;
-+	ast_update_use_count();
-+}
-+
-+static struct ast_translator g723tolin =
-+	{ "g723tolin_dummy", 
-+	   AST_FORMAT_G723_1, AST_FORMAT_SLINEAR,
-+	   g723tolin_new,
-+	   g723tolin_framein,
-+	   g723tolin_frameout,
-+	   g723_destroy,
-+	   g723tolin_sample
-+	   };
-+
-+static struct ast_translator lintog723 =
-+	{ "lintog723_dummy", 
-+	   AST_FORMAT_SLINEAR, AST_FORMAT_G723_1,
-+	   lintog723_new,
-+	   lintog723_framein,
-+	   lintog723_frameout,
-+	   g723_destroy,
-+	   lintog723_sample
-+	   };
-+
-+int unload_module(void)
-+{
-+	int res;
-+	ast_mutex_lock(&localuser_lock);
-+	res = ast_unregister_translator(&lintog723);
-+	if (!res)
-+		res = ast_unregister_translator(&g723tolin);
-+	if (localusecnt)
-+		res = -1;
-+	ast_mutex_unlock(&localuser_lock);
-+	return res;
-+}
-+
-+int load_module(void)
-+{
-+	int res;
-+	res=ast_register_translator(&g723tolin);
-+	if (!res) 
-+		res=ast_register_translator(&lintog723);
-+	else
-+		ast_unregister_translator(&g723tolin);
-+	return res;
-+}
-+
-+char *description(void)
-+{
-+	return tdesc;
-+}
-+
-+int usecount(void)
-+{
-+	int res;
-+	STANDARD_USECOUNT(res);
-+	return res;
-+}
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk10/files/patch-codecs::codec_g729_dummy.c b/net/asterisk10/files/patch-codecs::codec_g729_dummy.c
deleted file mode 100644
index c3e27d98e27e..000000000000
--- a/net/asterisk10/files/patch-codecs::codec_g729_dummy.c
+++ /dev/null
@@ -1,281 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g729_dummy.c	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,275 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Translate between signed linear and G.729 (dummy!)
-+ *
-+ * The G.729 code is not included in the Asterisk distribution because
-+ * it is covered with patents, and in spite of statements to the contrary,
-+ * the "technology" is extremely expensive to license.
-+ * 
-+ * Copyright (C) 1999, Mark Spencer
-+ *
-+ * Mark Spencer <markster@linux-support.net>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#include <sys/types.h>
-+#include <asterisk/translate.h>
-+#include <asterisk/module.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/channel.h>
-+#include <pthread.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <netinet/in.h>
-+#include <string.h>
-+#include <stdio.h>
-+
-+/* Sample frame data */
-+#include "slin_g729_ex.h"
-+#include "g729_slin_ex.h"
-+
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
-+static int localusecnt=0;
-+
-+static char *tdesc = "Dummy G.729/PCM16 Codec Translator";
-+
-+struct g729_encoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Buffer for our outgoing frame */
-+	char outbuf[8000];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+struct g729_decoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+static struct ast_translator_pvt *g729tolin_new()
-+{
-+	struct g729_decoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g729_decoder_pvt));
-+	if (tmp) {
-+		tmp->tail = 0;
-+		localusecnt++;
-+		ast_update_use_count();
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *lintog729_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_SLINEAR;
-+	f.datalen = sizeof(slin_g729_ex);
-+	/* Assume 8000 Hz */
-+	f.samples = sizeof(slin_g729_ex)/16;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = slin_g729_ex;
-+	return &f;
-+}
-+
-+static struct ast_frame *g729tolin_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_G729A;
-+	f.datalen = sizeof(g729_slin_ex);
-+	/* All frames are 10 ms long */
-+	f.samples = 10;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = g729_slin_ex;
-+	return &f;
-+}
-+
-+static struct ast_translator_pvt *lintog729_new()
-+{
-+	struct g729_encoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g729_encoder_pvt));
-+	if (tmp) {
-+		localusecnt++;
-+		ast_update_use_count();
-+		tmp->tail = 0;
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *g729tolin_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt;
-+	if (!tmp->tail)
-+		return NULL;
-+	/* Signed linear is no particular frame size, so just send whatever
-+	   we have in the buffer in one lump sum */
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_SLINEAR;
-+	tmp->f.datalen = tmp->tail * 2;
-+	/* Assume 8000 Hz */
-+	tmp->f.samples = tmp->tail / 8;
-+	tmp->f.mallocd = 0;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.data = tmp->buf;
-+	/* Reset tail pointer */
-+	tmp->tail = 0;
-+
-+	return &tmp->f;	
-+}
-+
-+static int g729tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt;
-+	int len = 0;
-+	while(len < f->datalen) {
-+		/* Assuming there's space left, decode into the current buffer at
-+		   the tail location */
-+		if (10 + len > f->datalen) {
-+			ast_log(LOG_WARNING, "Measured length exceeds frame length\n");
-+			return -1;
-+		}
-+		if (tmp->tail + 160 < sizeof(tmp->buf)/2) {	
-+			memset(tmp->buf + tmp->tail, 0, 160);
-+			tmp->tail+=160;
-+		} else {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return -1;
-+		}
-+		len += 10;
-+	}
-+	return 0;
-+}
-+
-+static int lintog729_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	/* Just add the frames to our stream */
-+	/* XXX We should look at how old the rest of our stream is, and if it
-+	   is too old, then we should overwrite it entirely, otherwise we can
-+	   get artifacts of earlier talk that do not belong */
-+	struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt;
-+	if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) {
-+		memcpy(&tmp->buf[tmp->tail], f->data, f->datalen);
-+		tmp->tail += f->datalen/2;
-+	} else {
-+		ast_log(LOG_WARNING, "Out of buffer space\n");
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static struct ast_frame *lintog729_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt;
-+	int cnt=0;
-+	/* We can't work on anything less than a frame in size */
-+	if (tmp->tail < 160)
-+		return NULL;
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_G729A;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.samples = 0;
-+	tmp->f.mallocd = 0;
-+	while(tmp->tail >= 160) {
-+		/* Encode a frame of data */
-+		if (cnt + 10 >= sizeof(tmp->outbuf)) {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return NULL;
-+		}
-+		memset(tmp->outbuf + cnt, 0, 10);
-+		/* Assume 8000 Hz */
-+		tmp->f.samples += 10;
-+		cnt += 10;
-+		tmp->tail -= 160;
-+		/* Move the data at the end of the buffer to the front */
-+		if (tmp->tail)
-+			memmove(tmp->buf, tmp->buf + 160, tmp->tail * 2);
-+	}
-+	tmp->f.datalen = cnt;
-+	tmp->f.data = tmp->outbuf;
-+	return &tmp->f;	
-+}
-+
-+static void g729_destroy(struct ast_translator_pvt *pvt)
-+{
-+	free(pvt);
-+	localusecnt--;
-+	ast_update_use_count();
-+}
-+
-+static struct ast_translator g729tolin =
-+	{ "g729tolin_dummy", 
-+	   AST_FORMAT_G729A, AST_FORMAT_SLINEAR,
-+	   g729tolin_new,
-+	   g729tolin_framein,
-+	   g729tolin_frameout,
-+	   g729_destroy,
-+	   g729tolin_sample
-+	   };
-+
-+static struct ast_translator lintog729 =
-+	{ "lintog729_dummy", 
-+	   AST_FORMAT_SLINEAR, AST_FORMAT_G729A,
-+	   lintog729_new,
-+	   lintog729_framein,
-+	   lintog729_frameout,
-+	   g729_destroy,
-+	   lintog729_sample
-+	   };
-+
-+int unload_module(void)
-+{
-+	int res;
-+	ast_mutex_lock(&localuser_lock);
-+	res = ast_unregister_translator(&lintog729);
-+	if (!res)
-+		res = ast_unregister_translator(&g729tolin);
-+	if (localusecnt)
-+		res = -1;
-+	ast_mutex_unlock(&localuser_lock);
-+	return res;
-+}
-+
-+int load_module(void)
-+{
-+	int res;
-+	res=ast_register_translator(&g729tolin);
-+	if (!res) 
-+		res=ast_register_translator(&lintog729);
-+	else
-+		ast_unregister_translator(&g729tolin);
-+	return res;
-+}
-+
-+char *description(void)
-+{
-+	return tdesc;
-+}
-+
-+int usecount(void)
-+{
-+	int res;
-+	STANDARD_USECOUNT(res);
-+	return res;
-+}
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk10/files/patch-codecs::g729_slin_ex.h b/net/asterisk10/files/patch-codecs::g729_slin_ex.h
deleted file mode 100644
index 44e60f2de848..000000000000
--- a/net/asterisk10/files/patch-codecs::g729_slin_ex.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/g729_slin_ex.h	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,14 @@
-+/*
-+ * g729_slin_ex.h --
-+ *
-+ *      8-bit G.729 data, 10 milliseconds worth at 8 kHz.
-+ *
-+ * Copyright (C) 2004, Maxim Sobolev <sobomax@FreeBSD.org>
-+ *
-+ * Distributed under the terms of the GNU General Public License
-+ *
-+ */
-+
-+static unsigned char g729_slin_ex[] = {
-+120,82,175,64,0,250,219,0,7,214
-+};
diff --git a/net/asterisk10/files/patch-codecs::gsm::Makefile b/net/asterisk10/files/patch-codecs::gsm::Makefile
deleted file mode 100644
index d60ed11f3298..000000000000
--- a/net/asterisk10/files/patch-codecs::gsm::Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- codecs/gsm/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/gsm/Makefile	Fri Jan 30 01:47:34 2004
-@@ -60,8 +60,8 @@
- # CC		= /usr/lang/acc
- # CCFLAGS 	= -c -O
- 
--CC		= gcc $(OPTIMIZE) -fomit-frame-pointer 
--CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
-+CC		?= gcc
-+CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer
- 
- LD 		= $(CC)
- 
-@@ -146,7 +146,7 @@
- DEBUG	= -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
- 
--CFLAGS	= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
-+CFLAGS	+= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
- 	$(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC)
- ######### It's $(CC) $(CFLAGS)
- 
diff --git a/net/asterisk10/files/patch-codecs::ilbc::Makefile b/net/asterisk10/files/patch-codecs::ilbc::Makefile
deleted file mode 100644
index 7770e07550a4..000000000000
--- a/net/asterisk10/files/patch-codecs::ilbc::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-
-$FreeBSD$
-
---- codecs/ilbc/Makefile.orig	Sun Apr 27 21:13:11 2003
-+++ codecs/ilbc/Makefile	Fri Jan 30 01:47:34 2004
-@@ -1,4 +1,4 @@
--CFLAGS+= -fPIC -O3
-+CFLAGS+= -fPIC
- LIB=libilbc.a
- 
- OBJS= anaFilter.o iCBSearch.o packing.o \
diff --git a/net/asterisk10/files/patch-codecs::lpc10::Makefile b/net/asterisk10/files/patch-codecs::lpc10::Makefile
deleted file mode 100644
index 68c98c064f70..000000000000
--- a/net/asterisk10/files/patch-codecs::lpc10::Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD$
-
---- codecs/lpc10/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/lpc10/Makefile	Fri Jan 30 02:06:54 2004
-@@ -3,7 +3,7 @@
- # 
- 
- # default C compiler
--CC= gcc
-+CC?= gcc
- 
- # 
- # These definitions for CFLAGS and LIB_TARGET_DIR are used when one
-@@ -22,14 +22,14 @@
- # 
- 
- WARNINGS = -Wall -Wno-comment -Wno-error
--CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
-+CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
- #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
- 
- #fix for PPC processors
- ifneq ($(OSARCH),Darwin)
- ifneq ($(PROC),ppc)
- ifneq ($(PROC),x86_64)
--	CFLAGS+= -march=$(PROC)
-+	CFLAGS+= 
- endif
- endif
- endif
diff --git a/net/asterisk10/files/patch-codecs::slin_g729_ex.h b/net/asterisk10/files/patch-codecs::slin_g729_ex.h
deleted file mode 100644
index e1236d2498dc..000000000000
--- a/net/asterisk10/files/patch-codecs::slin_g729_ex.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/slin_g729_ex.h	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,25 @@
-+/*
-+ * slin_g729_ex.h --
-+ *
-+ *	Signed 16-bit audio data, 10 milliseconds worth at 8 kHz.
-+ *
-+ * Source: g723.example
-+ *
-+ * Copyright (C) 2001, Linux Support Services, Inc.
-+ *
-+ * Distributed under the terms of the GNU General Public License
-+ *
-+ */
-+
-+static signed short slin_g729_ex[] = {
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
-+};
diff --git a/net/asterisk10/files/patch-db.c b/net/asterisk10/files/patch-db.c
deleted file mode 100644
index 59e5cef87770..000000000000
--- a/net/asterisk10/files/patch-db.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- db.c.orig	Tue Dec  2 17:12:56 2003
-+++ db.c	Fri Jan 30 01:47:34 2004
-@@ -32,7 +32,7 @@
- #include <asterisk/options.h>
- #include <asterisk/astdb.h>
- #include <asterisk/cli.h>
--#include "db1-ast/include/db.h"
-+#include <db.h>
- #include "asterisk.h"
- #include "astconf.h"
- 
diff --git a/net/asterisk10/files/patch-editline::configure b/net/asterisk10/files/patch-editline::configure
deleted file mode 100644
index f6b9c5b76eee..000000000000
--- a/net/asterisk10/files/patch-editline::configure
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- editline/configure.orig	Sun Apr 27 21:13:11 2003
-+++ editline/configure	Fri Jan 30 01:47:34 2004
-@@ -1906,7 +1906,7 @@
-   CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG"
-   CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE"
- else
--  CFLAGS="$CFLAGS -O"
-+  CFLAGS="$CFLAGS"
- fi
- 
- 
diff --git a/net/asterisk10/files/patch-formats::Makefile b/net/asterisk10/files/patch-formats::Makefile
deleted file mode 100644
index dacfd7b08303..000000000000
--- a/net/asterisk10/files/patch-formats::Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- formats/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ formats/Makefile	Fri Jan 30 01:47:34 2004
-@@ -18,7 +18,7 @@
- #
- # G723 simple frame is depricated
- #
--#FORMAT_LIBS+=format_g723.so
-+FORMAT_LIBS+=format_g723_1.so
- 
- GSMLIB=../codecs/gsm/lib/libgsm.a
- 
-@@ -40,7 +40,7 @@
- 	$(CC) $(SOLINK) -o $@ $< -lm
- 
- install: all
--	for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(FORMAT_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk10/files/patch-formats::format_g723_1.c b/net/asterisk10/files/patch-formats::format_g723_1.c
deleted file mode 100644
index 8d0755e14205..000000000000
--- a/net/asterisk10/files/patch-formats::format_g723_1.c
+++ /dev/null
@@ -1,351 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ formats/format_g723_1.c	Fri Jan 30 01:58:19 2004
-@@ -0,0 +1,345 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Save and read raw, headerless G723.1 Annex A data.
-+ *
-+ * Copyright (C) 1999, Mark Spencer <markster@linux-support.net>
-+ * Copyright (C) 2003, Maxim Sobolev <sobomax@FreeBSD.org>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#include <asterisk/lock.h>
-+#include <asterisk/channel.h>
-+#include <asterisk/file.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/sched.h>
-+#include <asterisk/module.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <stdlib.h>
-+#include <sys/time.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#include <string.h>
-+#include <pthread.h>
-+#ifdef __linux__
-+#include <endian.h>
-+#else
-+#include <machine/endian.h>
-+#endif
-+
-+/* Based on format_g729.c */
-+
-+#define TYPE_HIGH	0x0
-+#define TYPE_LOW	0x1
-+#define TYPE_SILENCE	0x2
-+#define TYPE_DONTSEND	0x3
-+#define TYPE_MASK	0x3
-+
-+struct ast_filestream {
-+	void *reserved[AST_RESERVED_POINTERS];
-+	/* This is what a filestream means to us */
-+	int fd; 				/* Descriptor */
-+	struct ast_frame fr;			/* Frame information */
-+	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
-+	char empty;				/* Empty character */
-+	unsigned char g723[24];			/* One Real G723.1 Frame */
-+};
-+
-+static long g723_tell(struct ast_filestream *);
-+
-+static ast_mutex_t g723_lock = AST_MUTEX_INITIALIZER;
-+static int glistcnt = 0;
-+
-+static char *name = "g723";
-+static char *desc = "Raw G723.1 Annex A data";
-+static char *exts = "g723";
-+
-+static int g723_len(unsigned char buf)
-+{
-+	switch(buf & TYPE_MASK) {
-+	case TYPE_DONTSEND:
-+		return 2;
-+		break;
-+	case TYPE_SILENCE:
-+		return 4;
-+		break;
-+	case TYPE_HIGH:
-+		return 24;
-+		break;
-+	case TYPE_LOW:
-+		return 20;
-+		break;
-+	default:
-+		ast_log(LOG_WARNING, "Badly encoded G723.1 frame (%d)\n", buf & TYPE_MASK);
-+	}
-+	return -1;
-+}
-+
-+static struct ast_filestream *g723_open(int fd)
-+{
-+	/* We don't have any header to read or anything really, but
-+	   if we did, it would go here.  We also might want to check
-+	   and be sure it's a valid file.  */
-+	struct ast_filestream *tmp;
-+	if ((tmp = malloc(sizeof(struct ast_filestream)))) {
-+		memset(tmp, 0, sizeof(struct ast_filestream));
-+		if (ast_mutex_lock(&g723_lock)) {
-+			ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+			free(tmp);
-+			return NULL;
-+		}
-+		tmp->fd = fd;
-+		tmp->fr.data = tmp->g723;
-+		tmp->fr.frametype = AST_FRAME_VOICE;
-+		tmp->fr.subclass = AST_FORMAT_G723_1;
-+		/* datalen will vary for each frame */
-+		tmp->fr.src = name;
-+		tmp->fr.mallocd = 0;
-+		glistcnt++;
-+		ast_mutex_unlock(&g723_lock);
-+		ast_update_use_count();
-+	}
-+	return tmp;
-+}
-+
-+static struct ast_filestream *g723_rewrite(int fd, char *comment)
-+{
-+	/* We don't have any header to read or anything really, but
-+	   if we did, it would go here.  We also might want to check
-+	   and be sure it's a valid file.  */
-+	struct ast_filestream *tmp;
-+	if ((tmp = malloc(sizeof(struct ast_filestream)))) {
-+		memset(tmp, 0, sizeof(struct ast_filestream));
-+		if (ast_mutex_lock(&g723_lock)) {
-+			ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+			free(tmp);
-+			return NULL;
-+		}
-+		tmp->fd = fd;
-+		glistcnt++;
-+		ast_mutex_unlock(&g723_lock);
-+		ast_update_use_count();
-+	} else
-+		ast_log(LOG_WARNING, "Out of memory\n");
-+	return tmp;
-+}
-+
-+static void g723_close(struct ast_filestream *s)
-+{
-+	if (ast_mutex_lock(&g723_lock)) {
-+		ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+		return;
-+	}
-+	glistcnt--;
-+	ast_mutex_unlock(&g723_lock);
-+	ast_update_use_count();
-+	close(s->fd);
-+	free(s);
-+	s = NULL;
-+}
-+
-+static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext)
-+{
-+	int res;
-+	/* Send a frame from the file to the appropriate channel */
-+	s->fr.frametype = AST_FRAME_VOICE;
-+	s->fr.subclass = AST_FORMAT_G723_1;
-+	s->fr.offset = AST_FRIENDLY_OFFSET;
-+	s->fr.samples = 240;
-+	s->fr.mallocd = 0;
-+	s->fr.data = s->g723;
-+	if ((res = read(s->fd, s->g723, 1)) != 1) {
-+		if (res)
-+			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
-+		return NULL;
-+	}
-+	s->fr.datalen = g723_len(s->g723[0]);
-+	if (s->fr.datalen < 0) {
-+		ast_log(LOG_WARNING, "Invalid G723.1 frame!\n");
-+		return NULL;
-+	}
-+	if (s->fr.datalen > 1 && (res = read(s->fd, s->g723 + 1, s->fr.datalen - 1)) != s->fr.datalen - 1) {
-+		if (res)
-+			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
-+		return NULL;
-+	}
-+	*whennext = s->fr.samples;
-+	return &s->fr;
-+}
-+
-+static int g723_write(struct ast_filestream *fs, struct ast_frame *f)
-+{
-+	int res;
-+	unsigned char *cp;
-+	if (f->frametype != AST_FRAME_VOICE) {
-+		ast_log(LOG_WARNING, "Asked to write non-voice frame!\n");
-+		return -1;
-+	}
-+	if (f->subclass != AST_FORMAT_G723_1) {
-+		ast_log(LOG_WARNING, "Asked to write non-G723.1 frame (%d)!\n", f->subclass);
-+		return -1;
-+	}
-+	for (cp = f->data; cp < (unsigned char *)f->data + f->datalen; cp += res) {
-+		res = g723_len(cp[0]);
-+		if (res < 0) {
-+			ast_log(LOG_WARNING, "Asked to write invalid G723.1 frame!\n");
-+			return -1;
-+		}
-+	}
-+	if (cp != (unsigned char *)f->data + f->datalen) {
-+		ast_log(LOG_WARNING, "Invalid G723.1 data length, %d\n", f->datalen);
-+		return -1;
-+	}
-+	if ((res = write(fs->fd, f->data, f->datalen)) != f->datalen) {
-+		ast_log(LOG_WARNING, "Bad write %d: %s\n", res, strerror(errno));
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static char *g723_getcomment(struct ast_filestream *s)
-+{
-+	return NULL;
-+}
-+
-+static int g723_seek(struct ast_filestream *fs, long sample_offset, int whence)
-+{
-+	long cur, offset, max;
-+	off_t coffset, moffset, soffset;
-+	int res;
-+	unsigned char c;
-+
-+	offset = 0;	/* Shut up gcc warning */
-+	if (whence == SEEK_SET) {
-+		offset = sample_offset;
-+	} else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) {
-+		if ((cur = g723_tell(fs)) == -1) {
-+			ast_log(LOG_WARNING, "Can't get current position!\n");
-+			return -1;
-+		}
-+		offset = cur + sample_offset;
-+	}
-+	if ((moffset = lseek(fs->fd, 0, SEEK_END)) == -1) {
-+		ast_log(LOG_WARNING, "Can't seek stream to an end!\n");
-+		return -1;
-+	}
-+	if (whence == SEEK_END) {
-+		if ((max = g723_tell(fs)) == -1) {
-+			ast_log(LOG_WARNING, "Can't get maximum position!\n");
-+			return -1;
-+		}
-+		offset = max - sample_offset;
-+	}
-+	if (offset < 0)
-+		offset = 0;
-+	soffset = -1;
-+	for (coffset = 0; coffset < moffset && offset > 0; coffset += res) {
-+		if (lseek(fs->fd, coffset, SEEK_SET) != coffset) {
-+			ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		if (read(fs->fd, &c, 1) != 1) {
-+			ast_log(LOG_WARNING, "Can't read from offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		soffset = coffset;
-+		if ((res = g723_len(c)) < 0) {
-+			ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		if (res > 1)
-+			offset -= 240;
-+	}
-+	if (soffset != -1 && lseek(fs->fd, soffset, SEEK_SET) != soffset) {
-+		ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", soffset);
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+static int g723_trunc(struct ast_filestream *fs)
-+{
-+	/* Truncate file to current length */
-+	if (ftruncate(fs->fd, lseek(fs->fd, 0, SEEK_CUR)) < 0)
-+		return -1;
-+	return 0;
-+}
-+
-+static long g723_tell(struct ast_filestream *fs)
-+{
-+	off_t offset, coffset;
-+	int res;
-+	long rval;
-+	unsigned char c;
-+
-+	offset = lseek(fs->fd, 0, SEEK_CUR);
-+	rval = 0;
-+	for (coffset = 0; coffset < offset; coffset += res) {
-+		if (lseek(fs->fd, coffset, SEEK_SET) != coffset) {
-+			ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if (read(fs->fd, &c, 1) != 1) {
-+			ast_log(LOG_WARNING, "Can't read from offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if ((res = g723_len(c)) < 0) {
-+			ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if (res > 1)
-+			rval += 240;
-+	}
-+	if (lseek(fs->fd, offset, SEEK_SET) != offset) {
-+		ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", offset);
-+		return -1;
-+	}
-+	return rval;
-+}
-+
-+int load_module()
-+{
-+	return ast_format_register(name, exts, AST_FORMAT_G723_1,
-+				   g723_open,
-+				   g723_rewrite,
-+				   g723_write,
-+				   g723_seek,
-+				   g723_trunc,
-+				   g723_tell,
-+				   g723_read,
-+				   g723_close,
-+				   g723_getcomment);
-+}
-+
-+int unload_module()
-+{
-+	return ast_format_unregister(name);
-+}
-+
-+int usecount()
-+{
-+	int res;
-+	if (ast_mutex_lock(&g723_lock)) {
-+		ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+		return -1;
-+	}
-+	res = glistcnt;
-+	ast_mutex_unlock(&g723_lock);
-+	return res;
-+}
-+
-+char *description()
-+{
-+	return desc;
-+}
-+
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk10/files/patch-formats::format_g729.c b/net/asterisk10/files/patch-formats::format_g729.c
deleted file mode 100644
index a144d1b0f6bf..000000000000
--- a/net/asterisk10/files/patch-formats::format_g729.c
+++ /dev/null
@@ -1,47 +0,0 @@
-
-$FreeBSD$
-
---- formats/format_g729.c.orig	Wed Jan 28 23:32:48 2004
-+++ formats/format_g729.c	Thu Feb 19 01:03:30 2004
-@@ -45,7 +45,7 @@
- 	struct ast_frame fr;				/* Frame information */
- 	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
- 	char empty;							/* Empty character */
--	unsigned char g729[20];				/* Two Real G729 Frames */
-+	unsigned char g729[10];				/* One Real G729 Frame */
- };
- 
- 
-@@ -126,11 +126,11 @@
- 	s->fr.frametype = AST_FRAME_VOICE;
- 	s->fr.subclass = AST_FORMAT_G729A;
- 	s->fr.offset = AST_FRIENDLY_OFFSET;
--	s->fr.samples = 160;
--	s->fr.datalen = 20;
-+	s->fr.samples = 80;
-+	s->fr.datalen = 10;
- 	s->fr.mallocd = 0;
- 	s->fr.data = s->g729;
--	if ((res = read(s->fd, s->g729, 20)) != 20) {
-+	if ((res = read(s->fd, s->g729, 10)) != 10) {
- 		if (res)
- 			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
- 		return NULL;
-@@ -174,7 +174,7 @@
- 	cur = lseek(fs->fd, 0, SEEK_CUR);
- 	max = lseek(fs->fd, 0, SEEK_END);
- 	
--	bytes = 20 * (sample_offset / 160);
-+	bytes = 10 * (sample_offset / 80);
- 	if (whence == SEEK_SET)
- 		offset = bytes;
- 	else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
-@@ -202,7 +202,7 @@
- {
- 	off_t offset;
- 	offset = lseek(fs->fd, 0, SEEK_CUR);
--	return (offset/20)*160;
-+	return (offset/10)*80;
- }
- 
- int load_module()
diff --git a/net/asterisk10/files/patch-pbx::Makefile b/net/asterisk10/files/patch-pbx::Makefile
deleted file mode 100644
index dca6672c389a..000000000000
--- a/net/asterisk10/files/patch-pbx::Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- pbx/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ pbx/Makefile	Fri Jan 30 01:47:34 2004
-@@ -16,7 +16,7 @@
- PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so     # pbx_gtkconsole.so pbx_kdeconsole.so
- 
- # Add GTK console if appropriate
--PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
-+#PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
- # Add KDE Console if appropriate
- #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so")
- 
-@@ -62,7 +62,7 @@
- endif
- 
- install: all
--	for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(PBX_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk10/files/patch-res::Makefile b/net/asterisk10/files/patch-res::Makefile
deleted file mode 100644
index ccd0a35dd59d..000000000000
--- a/net/asterisk10/files/patch-res::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- res/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ res/Makefile	Fri Jan 30 01:47:34 2004
-@@ -25,7 +25,7 @@
- all: depend $(MODS)
- 
- install: all
--	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- res_crypto.so: res_crypto.o
- 	$(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS)
diff --git a/net/asterisk10/pkg-descr b/net/asterisk10/pkg-descr
deleted file mode 100644
index 28b7a1deb011..000000000000
--- a/net/asterisk10/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
-sense, middleware between Internet and telephony channels on the bottom,
-and Internet and telephony applications at the top.
-
-WWW: http://www.asteriskpbx.com
diff --git a/net/asterisk10/pkg-plist b/net/asterisk10/pkg-plist
deleted file mode 100644
index ab3eff23ff6e..000000000000
--- a/net/asterisk10/pkg-plist
+++ /dev/null
@@ -1,462 +0,0 @@
-@unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi
-etc/asterisk/adsi.conf-dist
-@exec [ -f %B/adsi.conf ] || cp %B/%f %B/adsi.conf
-@unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi
-etc/asterisk/adtranvofr.conf-dist
-@exec [ -f %B/adtranvofr.conf ] || cp %B/%f %B/adtranvofr.conf
-@unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi
-etc/asterisk/agents.conf-dist
-@exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf
-@unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi
-etc/asterisk/alsa.conf-dist
-@exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf
-@unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi
-etc/asterisk/asterisk.adsi-dist
-@exec [ -f %B/asterisk.adsi ] || cp %B/%f %B/asterisk.adsi
-@unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi
-etc/asterisk/asterisk.conf-dist
-@exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf
-@unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi
-etc/asterisk/cdr_odbc.conf-dist
-@exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf
-@unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi
-etc/asterisk/cdr_pgsql.conf-dist
-@exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf
-@unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi
-etc/asterisk/enum.conf-dist
-@exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf
-@unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi
-etc/asterisk/extensions.conf-dist
-@exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf
-@unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
-etc/asterisk/festival.conf-dist
-@exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
-@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
-etc/asterisk/h323.conf-dist
-@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.conf
-@unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
-etc/asterisk/iax.conf-dist
-@exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
-@unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi
-etc/asterisk/indications.conf-dist
-@exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf
-@unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi
-etc/asterisk/logger.conf-dist
-@exec [ -f %B/logger.conf ] || cp %B/%f %B/logger.conf
-@unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi
-etc/asterisk/manager.conf-dist
-@exec [ -f %B/manager.conf ] || cp %B/%f %B/manager.conf
-@unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi
-etc/asterisk/meetme.conf-dist
-@exec [ -f %B/meetme.conf ] || cp %B/%f %B/meetme.conf
-@unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi
-etc/asterisk/mgcp.conf-dist
-@exec [ -f %B/mgcp.conf ] || cp %B/%f %B/mgcp.conf
-@unexec if cmp -s %D/etc/asterisk/modem.conf %D/etc/asterisk/modem.conf-dist; then rm -f %D/etc/asterisk/modem.conf; fi
-etc/asterisk/modem.conf-dist
-@exec [ -f %B/modem.conf ] || cp %B/%f %B/modem.conf
-@unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi
-etc/asterisk/modules.conf-dist
-@exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf
-@unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi
-etc/asterisk/musiconhold.conf-dist
-@exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf
-@unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi
-etc/asterisk/oss.conf-dist
-@exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf
-@unexec if cmp -s %D/etc/asterisk/parking.conf %D/etc/asterisk/parking.conf-dist; then rm -f %D/etc/asterisk/parking.conf; fi
-etc/asterisk/parking.conf-dist
-@exec [ -f %B/parking.conf ] || cp %B/%f %B/parking.conf
-@unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi
-etc/asterisk/phone.conf-dist
-@exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf
-@unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi
-etc/asterisk/privacy.conf-dist
-@exec [ -f %B/privacy.conf ] || cp %B/%f %B/privacy.conf
-@unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi
-etc/asterisk/queues.conf-dist
-@exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf
-@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi
-etc/asterisk/rpt.conf-dist
-@exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf
-@unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi
-etc/asterisk/rtp.conf-dist
-@exec [ -f %B/rtp.conf ] || cp %B/%f %B/rtp.conf
-@unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi
-etc/asterisk/sip.conf-dist
-@exec [ -f %B/sip.conf ] || cp %B/%f %B/sip.conf
-@unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi
-etc/asterisk/skinny.conf-dist
-@exec [ -f %B/skinny.conf ] || cp %B/%f %B/skinny.conf
-@unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi
-etc/asterisk/telcordia-1.adsi-dist
-@exec [ -f %B/telcordia-1.adsi ] || cp %B/%f %B/telcordia-1.adsi
-@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi
-etc/asterisk/voicemail.conf-dist
-@exec [ -f %B/voicemail.conf ] || cp %B/%f %B/voicemail.conf
-@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi
-etc/asterisk/vpb.conf-dist
-@exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf
-@unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi
-etc/asterisk/zapata.conf-dist
-@exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf
-include/asterisk/acl.h
-include/asterisk/adsi.h
-include/asterisk/aes.h
-include/asterisk/alaw.h
-include/asterisk/app.h
-include/asterisk/ast_expr.h
-include/asterisk/astdb.h
-include/asterisk/astmm.h
-include/asterisk/callerid.h
-include/asterisk/causes.h
-include/asterisk/cdr.h
-include/asterisk/channel.h
-include/asterisk/channel_pvt.h
-include/asterisk/chanvars.h
-include/asterisk/cli.h
-include/asterisk/config.h
-include/asterisk/crypto.h
-include/asterisk/cvsid.h
-include/asterisk/dlfcn-compat.h
-include/asterisk/dns.h
-include/asterisk/dsp.h
-include/asterisk/enum.h
-include/asterisk/file.h
-include/asterisk/frame.h
-include/asterisk/fskmodem.h
-include/asterisk/image.h
-include/asterisk/indications.h
-include/asterisk/io.h
-include/asterisk/linkedlists.h
-include/asterisk/localtime.h
-include/asterisk/lock.h
-include/asterisk/logger.h
-include/asterisk/manager.h
-include/asterisk/md5.h
-include/asterisk/module.h
-include/asterisk/monitor.h
-include/asterisk/musiconhold.h
-include/asterisk/options.h
-include/asterisk/parking.h
-include/asterisk/pbx.h
-include/asterisk/poll-compat.h
-include/asterisk/privacy.h
-include/asterisk/rtp.h
-include/asterisk/say.h
-include/asterisk/sched.h
-include/asterisk/srv.h
-include/asterisk/tdd.h
-include/asterisk/term.h
-include/asterisk/translate.h
-include/asterisk/ulaw.h
-include/asterisk/vmodem.h
-lib/asterisk/modules/app_adsiprog.so
-lib/asterisk/modules/app_agi.so
-lib/asterisk/modules/app_authenticate.so
-lib/asterisk/modules/app_cdr.so
-lib/asterisk/modules/app_chanisavail.so
-lib/asterisk/modules/app_cut.so
-lib/asterisk/modules/app_datetime.so
-lib/asterisk/modules/app_db.so
-lib/asterisk/modules/app_dial.so
-lib/asterisk/modules/app_directory.so
-lib/asterisk/modules/app_disa.so
-lib/asterisk/modules/app_echo.so
-lib/asterisk/modules/app_enumlookup.so
-lib/asterisk/modules/app_festival.so
-lib/asterisk/modules/app_getcpeid.so
-lib/asterisk/modules/app_hasnewvoicemail.so
-lib/asterisk/modules/app_image.so
-lib/asterisk/modules/app_intercom.so
-lib/asterisk/modules/app_lookupblacklist.so
-lib/asterisk/modules/app_lookupcidname.so
-lib/asterisk/modules/app_macro.so
-lib/asterisk/modules/app_milliwatt.so
-lib/asterisk/modules/app_mp3.so
-lib/asterisk/modules/app_parkandannounce.so
-lib/asterisk/modules/app_playback.so
-lib/asterisk/modules/app_privacy.so
-lib/asterisk/modules/app_qcall.so
-lib/asterisk/modules/app_queue.so
-lib/asterisk/modules/app_random.so
-lib/asterisk/modules/app_read.so
-lib/asterisk/modules/app_record.so
-lib/asterisk/modules/app_sayunixtime.so
-lib/asterisk/modules/app_senddtmf.so
-lib/asterisk/modules/app_setcallerid.so
-lib/asterisk/modules/app_setcdruserfield.so
-lib/asterisk/modules/app_setcidname.so
-lib/asterisk/modules/app_setcidnum.so
-lib/asterisk/modules/app_softhangup.so
-lib/asterisk/modules/app_striplsd.so
-lib/asterisk/modules/app_substring.so
-lib/asterisk/modules/app_system.so
-lib/asterisk/modules/app_transfer.so
-lib/asterisk/modules/app_url.so
-lib/asterisk/modules/app_voicemail.so
-lib/asterisk/modules/app_waitforring.so
-lib/asterisk/modules/app_zapateller.so
-lib/asterisk/modules/cdr_csv.so
-lib/asterisk/modules/chan_agent.so
-lib/asterisk/modules/chan_h323.so
-lib/asterisk/modules/chan_iax.so
-lib/asterisk/modules/chan_iax2.so
-lib/asterisk/modules/chan_local.so
-lib/asterisk/modules/chan_mgcp.so
-lib/asterisk/modules/chan_modem.so
-lib/asterisk/modules/chan_modem_aopen.so
-lib/asterisk/modules/chan_modem_bestdata.so
-lib/asterisk/modules/chan_modem_i4l.so
-lib/asterisk/modules/chan_oss.so
-lib/asterisk/modules/chan_sip.so
-lib/asterisk/modules/chan_skinny.so
-lib/asterisk/modules/codec_a_mu.so
-lib/asterisk/modules/codec_adpcm.so
-lib/asterisk/modules/codec_alaw.so
-lib/asterisk/modules/codec_g723_1_dummy.so
-lib/asterisk/modules/codec_g729_dummy.so
-lib/asterisk/modules/codec_gsm.so
-lib/asterisk/modules/codec_ilbc.so
-lib/asterisk/modules/codec_lpc10.so
-lib/asterisk/modules/codec_speex.so
-lib/asterisk/modules/codec_ulaw.so
-lib/asterisk/modules/format_g723_1.so
-lib/asterisk/modules/format_g729.so
-lib/asterisk/modules/format_gsm.so
-lib/asterisk/modules/format_h263.so
-lib/asterisk/modules/format_jpeg.so
-lib/asterisk/modules/format_pcm.so
-lib/asterisk/modules/format_pcm_alaw.so
-lib/asterisk/modules/format_vox.so
-lib/asterisk/modules/format_wav.so
-lib/asterisk/modules/format_wav_gsm.so
-lib/asterisk/modules/pbx_config.so
-lib/asterisk/modules/pbx_spool.so
-lib/asterisk/modules/pbx_wilcalu.so
-lib/asterisk/modules/res_adsi.so
-lib/asterisk/modules/res_crypto.so
-lib/asterisk/modules/res_indications.so
-lib/asterisk/modules/res_monitor.so
-lib/asterisk/modules/res_musiconhold.so
-lib/asterisk/modules/res_parking.so
-sbin/asterisk
-sbin/astgenkey
-sbin/safe_asterisk
-share/asterisk/agi-bin/agi-test.agi
-share/asterisk/agi-bin/eagi-sphinx-test
-share/asterisk/agi-bin/eagi-test
-share/asterisk/images/asterisk-intro.jpg
-share/asterisk/keys/iaxtel.pub
-share/asterisk/mohmp3/sample-hold.mp3
-share/asterisk/sounds/agent-alreadyon.gsm
-share/asterisk/sounds/agent-incorrect.gsm
-share/asterisk/sounds/agent-loggedoff.gsm
-share/asterisk/sounds/agent-loginok.gsm
-share/asterisk/sounds/agent-newlocation.gsm
-share/asterisk/sounds/agent-pass.gsm
-share/asterisk/sounds/agent-user.gsm
-share/asterisk/sounds/auth-incorrect.gsm
-share/asterisk/sounds/auth-thankyou.gsm
-share/asterisk/sounds/beep.gsm
-share/asterisk/sounds/conf-getchannel.gsm
-share/asterisk/sounds/conf-getconfno.gsm
-share/asterisk/sounds/conf-getpin.gsm
-share/asterisk/sounds/conf-invalid.gsm
-share/asterisk/sounds/conf-invalidpin.gsm
-share/asterisk/sounds/conf-onlyperson.gsm
-share/asterisk/sounds/demo-abouttotry.gsm
-share/asterisk/sounds/demo-congrats.gsm
-share/asterisk/sounds/demo-echodone.gsm
-share/asterisk/sounds/demo-echotest.gsm
-share/asterisk/sounds/demo-enterkeywords.gsm
-share/asterisk/sounds/demo-instruct.gsm
-share/asterisk/sounds/demo-moreinfo.gsm
-share/asterisk/sounds/demo-nogo.gsm
-share/asterisk/sounds/demo-nomatch.gsm
-share/asterisk/sounds/demo-thanks.gsm
-share/asterisk/sounds/digits/0.gsm
-share/asterisk/sounds/digits/1.gsm
-share/asterisk/sounds/digits/10.gsm
-share/asterisk/sounds/digits/11.gsm
-share/asterisk/sounds/digits/12.gsm
-share/asterisk/sounds/digits/13.gsm
-share/asterisk/sounds/digits/14.gsm
-share/asterisk/sounds/digits/15.gsm
-share/asterisk/sounds/digits/16.gsm
-share/asterisk/sounds/digits/17.gsm
-share/asterisk/sounds/digits/18.gsm
-share/asterisk/sounds/digits/19.gsm
-share/asterisk/sounds/digits/2.gsm
-share/asterisk/sounds/digits/20.gsm
-share/asterisk/sounds/digits/3.gsm
-share/asterisk/sounds/digits/30.gsm
-share/asterisk/sounds/digits/4.gsm
-share/asterisk/sounds/digits/40.gsm
-share/asterisk/sounds/digits/5.gsm
-share/asterisk/sounds/digits/50.gsm
-share/asterisk/sounds/digits/6.gsm
-share/asterisk/sounds/digits/60.gsm
-share/asterisk/sounds/digits/7.gsm
-share/asterisk/sounds/digits/70.gsm
-share/asterisk/sounds/digits/8.gsm
-share/asterisk/sounds/digits/80.gsm
-share/asterisk/sounds/digits/9.gsm
-share/asterisk/sounds/digits/90.gsm
-share/asterisk/sounds/digits/a-m.gsm
-share/asterisk/sounds/digits/at.gsm
-share/asterisk/sounds/digits/day-0.gsm
-share/asterisk/sounds/digits/day-1.gsm
-share/asterisk/sounds/digits/day-2.gsm
-share/asterisk/sounds/digits/day-3.gsm
-share/asterisk/sounds/digits/day-4.gsm
-share/asterisk/sounds/digits/day-5.gsm
-share/asterisk/sounds/digits/day-6.gsm
-share/asterisk/sounds/digits/dollars.gsm
-share/asterisk/sounds/digits/h-1.gsm
-share/asterisk/sounds/digits/h-10.gsm
-share/asterisk/sounds/digits/h-11.gsm
-share/asterisk/sounds/digits/h-12.gsm
-share/asterisk/sounds/digits/h-13.gsm
-share/asterisk/sounds/digits/h-14.gsm
-share/asterisk/sounds/digits/h-15.gsm
-share/asterisk/sounds/digits/h-16.gsm
-share/asterisk/sounds/digits/h-17.gsm
-share/asterisk/sounds/digits/h-18.gsm
-share/asterisk/sounds/digits/h-19.gsm
-share/asterisk/sounds/digits/h-2.gsm
-share/asterisk/sounds/digits/h-20.gsm
-share/asterisk/sounds/digits/h-3.gsm
-share/asterisk/sounds/digits/h-30.gsm
-share/asterisk/sounds/digits/h-4.gsm
-share/asterisk/sounds/digits/h-5.gsm
-share/asterisk/sounds/digits/h-6.gsm
-share/asterisk/sounds/digits/h-7.gsm
-share/asterisk/sounds/digits/h-8.gsm
-share/asterisk/sounds/digits/h-9.gsm
-share/asterisk/sounds/digits/hundred.gsm
-share/asterisk/sounds/digits/million.gsm
-share/asterisk/sounds/digits/mon-0.gsm
-share/asterisk/sounds/digits/mon-1.gsm
-share/asterisk/sounds/digits/mon-10.gsm
-share/asterisk/sounds/digits/mon-11.gsm
-share/asterisk/sounds/digits/mon-2.gsm
-share/asterisk/sounds/digits/mon-3.gsm
-share/asterisk/sounds/digits/mon-4.gsm
-share/asterisk/sounds/digits/mon-5.gsm
-share/asterisk/sounds/digits/mon-6.gsm
-share/asterisk/sounds/digits/mon-7.gsm
-share/asterisk/sounds/digits/mon-8.gsm
-share/asterisk/sounds/digits/mon-9.gsm
-share/asterisk/sounds/digits/oclock.gsm
-share/asterisk/sounds/digits/oh.gsm
-share/asterisk/sounds/digits/p-m.gsm
-share/asterisk/sounds/digits/pound.gsm
-share/asterisk/sounds/digits/star.gsm
-share/asterisk/sounds/digits/thousand.gsm
-share/asterisk/sounds/digits/today.gsm
-share/asterisk/sounds/digits/tomorrow.gsm
-share/asterisk/sounds/digits/yesterday.gsm
-share/asterisk/sounds/dir-instr.gsm
-share/asterisk/sounds/dir-intro.gsm
-share/asterisk/sounds/dir-nomatch.gsm
-share/asterisk/sounds/dir-nomore.gsm
-share/asterisk/sounds/invalid.gsm
-share/asterisk/sounds/pbx-invalid.gsm
-share/asterisk/sounds/pbx-invalidpark.gsm
-share/asterisk/sounds/pbx-transfer.gsm
-share/asterisk/sounds/privacy-incorrect.gsm
-share/asterisk/sounds/privacy-prompt.gsm
-share/asterisk/sounds/privacy-thankyou.gsm
-share/asterisk/sounds/privacy-unident.gsm
-share/asterisk/sounds/ss-noservice.gsm
-share/asterisk/sounds/transfer.gsm
-share/asterisk/sounds/tt-allbusy.gsm
-share/asterisk/sounds/tt-monkeys.gsm
-share/asterisk/sounds/tt-monkeysintro.gsm
-share/asterisk/sounds/tt-somethingwrong.gsm
-share/asterisk/sounds/tt-weasels.gsm
-share/asterisk/sounds/vm
-share/asterisk/sounds/vm-Family.gsm
-share/asterisk/sounds/vm-Friends.gsm
-share/asterisk/sounds/vm-INBOX.gsm
-share/asterisk/sounds/vm-Old.gsm
-share/asterisk/sounds/vm-Work.gsm
-share/asterisk/sounds/vm-and.gsm
-share/asterisk/sounds/vm-changeto.gsm
-share/asterisk/sounds/vm-delete.gsm
-share/asterisk/sounds/vm-deleted.gsm
-share/asterisk/sounds/vm-extension.gsm
-share/asterisk/sounds/vm-first.gsm
-share/asterisk/sounds/vm-for.gsm
-share/asterisk/sounds/vm-forwardoptions.gsm
-share/asterisk/sounds/vm-goodbye.gsm
-share/asterisk/sounds/vm-helpexit.gsm
-share/asterisk/sounds/vm-incorrect.gsm
-share/asterisk/sounds/vm-instructions.gsm
-share/asterisk/sounds/vm-intro.gsm
-share/asterisk/sounds/vm-isonphone.gsm
-share/asterisk/sounds/vm-isunavail.gsm
-share/asterisk/sounds/vm-last.gsm
-share/asterisk/sounds/vm-login.gsm
-share/asterisk/sounds/vm-mailboxfull.gsm
-share/asterisk/sounds/vm-message.gsm
-share/asterisk/sounds/vm-messages.gsm
-share/asterisk/sounds/vm-mismatch.gsm
-share/asterisk/sounds/vm-msginstruct.gsm
-share/asterisk/sounds/vm-msgsaved.gsm
-share/asterisk/sounds/vm-newpassword.gsm
-share/asterisk/sounds/vm-next.gsm
-share/asterisk/sounds/vm-no.gsm
-share/asterisk/sounds/vm-nobodyavail.gsm
-share/asterisk/sounds/vm-nomore.gsm
-share/asterisk/sounds/vm-onefor.gsm
-share/asterisk/sounds/vm-options.gsm
-share/asterisk/sounds/vm-opts.gsm
-share/asterisk/sounds/vm-passchanged.gsm
-share/asterisk/sounds/vm-password.gsm
-share/asterisk/sounds/vm-press.gsm
-share/asterisk/sounds/vm-prev.gsm
-share/asterisk/sounds/vm-rec-busy.gsm
-share/asterisk/sounds/vm-rec-name.gsm
-share/asterisk/sounds/vm-rec-unv.gsm
-share/asterisk/sounds/vm-received.gsm
-share/asterisk/sounds/vm-reenterpassword.gsm
-share/asterisk/sounds/vm-repeat.gsm
-share/asterisk/sounds/vm-saved.gsm
-share/asterisk/sounds/vm-savedto.gsm
-share/asterisk/sounds/vm-savefolder.gsm
-share/asterisk/sounds/vm-savemessage.gsm
-share/asterisk/sounds/vm-sorry.gsm
-share/asterisk/sounds/vm-theperson.gsm
-share/asterisk/sounds/vm-tocancel.gsm
-share/asterisk/sounds/vm-toforward.gsm
-share/asterisk/sounds/vm-undelete.gsm
-share/asterisk/sounds/vm-undeleted.gsm
-share/asterisk/sounds/vm-whichbox.gsm
-share/asterisk/sounds/vm-youhave.gsm
-share/asterisk/sounds/voicemail
-@dirrm share/asterisk/sounds/digits
-@dirrm share/asterisk/sounds
-@dirrm share/asterisk/mohmp3
-@dirrm share/asterisk/keys
-@dirrm share/asterisk/images
-@dirrm share/asterisk/agi-bin
-@dirrm share/asterisk
-@dirrm lib/asterisk/modules
-@dirrm lib/asterisk
-@dirrm include/asterisk
-@dirrm etc/asterisk
-@cwd /var
-spool/asterisk/vm
-spool/asterisk/voicemail/default/1234/busy.gsm
-spool/asterisk/voicemail/default/1234/unavail.gsm
-@exec mkdir -p %D/log/asterisk/cdr-csv
-@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX
-@dirrm spool/asterisk/voicemail/default/1234/INBOX
-@dirrm spool/asterisk/voicemail/default/1234
-@dirrm spool/asterisk/voicemail/default
-@dirrm spool/asterisk/voicemail
-@dirrm spool/asterisk
-@dirrm log/asterisk/cdr-csv
-@dirrm log/asterisk
diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile
deleted file mode 100644
index 82db2899e80a..000000000000
--- a/net/asterisk12/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for:	asterisk
-# Date created:				17 October 2003
-# Whom:					Maxim Sobolev <sobomax@portaone.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	asterisk
-PORTVERSION=	0.7.2
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
-		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
-
-MAINTAINER=	sobomax@FreeBSD.org
-COMMENT=	An Open Source PBX and telephony toolkit
-
-FORBIDDEN=	http://people.freebsd.org/~eik/portaudit/27c331d5-64c7-11d8-80e3-0020ed76ef5a.html
-
-ONLY_FOR_ARCHS=	i386
-
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
-		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
-LIB_DEPENDS=	speex.2:${PORTSDIR}/audio/speex
-RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
-
-GNU_CONFIGURE=	yes
-CONFIGURE_WRKSRC=	${WRKSRC}/editline
-USE_GMAKE=	yes
-USE_OPENLDAP=	yes
-MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		MKDIR="${MKDIR}" \
-		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \
-		OSVERSION=${OSVERSION} \
-		CXX="${CXX}"
-
-.include <bsd.port.mk>
diff --git a/net/asterisk12/distinfo b/net/asterisk12/distinfo
deleted file mode 100644
index 13e376bb0fae..000000000000
--- a/net/asterisk12/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (asterisk-0.7.2.tar.gz) = a1f9485f5f85a4e4129782b6e642e236
-SIZE (asterisk-0.7.2.tar.gz) = 2779788
diff --git a/net/asterisk12/files/patch-Makefile b/net/asterisk12/files/patch-Makefile
deleted file mode 100644
index 1e4ffbe62070..000000000000
--- a/net/asterisk12/files/patch-Makefile
+++ /dev/null
@@ -1,301 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig	Wed Jan 14 08:48:38 2004
-+++ Makefile	Fri Jan 30 02:25:09 2004
-@@ -43,10 +43,10 @@
- #K6OPT  = -DK6OPT
- 
- #Tell gcc to optimize the asterisk's code
--OPTIMIZE=-O6
-+#OPTIMIZE=-O6
- 
- #Include debug symbols in the executables (-g) and profiling info (-pg)
--DEBUG=-g #-pg
-+#DEBUG=-g #-pg
- 
- # New hangup routines for chan_zap.c
- # If this flag is uncommented then you need to have new libpri code in your system
-@@ -68,7 +68,7 @@
- 
- # Where to install asterisk after compiling
- # Default -> leave empty
--INSTALL_PREFIX=
-+INSTALL_PREFIX=$(PREFIX)
- 
- # Staging directory
- # Files are copied here temporarily during the install process
-@@ -88,28 +88,26 @@
- # Don't use together with -DBUSYDETECT_TONEONLY
- BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
- 
--ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
--ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
-+ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk
-+ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk
- ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
--ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
--ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
--ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
-+ASTSPOOLDIR=/var/spool/asterisk
-+ASTLOGDIR=/var/log/asterisk
-+ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk
- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
--ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
--ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
--ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
-+ASTBINDIR=$(INSTALL_PREFIX)/bin
-+ASTSBINDIR=$(INSTALL_PREFIX)/sbin
-+ASTVARRUNDIR=/var/run
- 
- MODULES_DIR=$(ASTLIBDIR)/modules
- AGI_DIR=$(ASTVARLIBDIR)/agi-bin
- 
- INCLUDE=-Iinclude -I../include
--CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
- CFLAGS+=$(OPTIMIZE)
--CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- ifeq (${OSARCH},FreeBSD)
--CFLAGS+=-pthread
--INCLUDE+=-I/usr/local/include
-+CFLAGS+=$(PTHREAD_CFLAGS)
- endif
- ifeq (${OSARCH},OpenBSD)
- CFLAGS+=-pthread
-@@ -151,7 +149,7 @@
- LIBS=-pthread
- else
- ifeq (${OSARCH},FreeBSD)
--LIBS=-pthread
-+LIBS=$(PTHREAD_LIBS)
- else
- endif
- endif
-@@ -179,7 +177,7 @@
- SOLINK=-shared -Xlinker -x
- endif
- 
--CC=gcc
-+CC?=gcc
- INSTALL=install
- 
- _all: all
-@@ -200,13 +198,13 @@
- 	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
- 	$(MAKE) -C editline libedit.a
- 
--db1-ast/libdb1.a: FORCE
--	@if [ -d db1-ast ]; then \
--		$(MAKE) -C db1-ast libdb1.a ; \
--	else \
--		echo "You need to do a cvs update -d not just cvs update"; \
--		exit 1; \
--	fi
-+#db1-ast/libdb1.a: FORCE
-+#	@if [ -d db1-ast ]; then \
-+#		$(MAKE) -C db1-ast libdb1.a ; \
-+#	else \
-+#		echo "You need to do a cvs update -d not just cvs update"; \
-+#		exit 1; \
-+#	fi
- 
- ifneq ($(wildcard .depend),)
- include .depend
-@@ -244,8 +242,8 @@
- 		exit 1; \
- 	fi
- 
--asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
--	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a
-+asterisk: editline/libedit.a stdtime/libtime.a $(OBJS)
-+	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) stdtime/libtime.a
- 
- subdirs: 
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
-@@ -260,10 +258,10 @@
- 	$(MAKE) -C stdtime clean
- 
- datafiles: all
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
- 	for x in sounds/digits/*.gsm; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
-@@ -271,18 +269,18 @@
- 	done
- 	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-*; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
- 		fi; \
- 	done
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/images
- 	for x in images/*.jpg; do \
--		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
- 	done
--	mkdir -p $(DESTDIR)$(AGI_DIR)
-+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
- 
- update: 
- 	@if [ -d CVS ]; then \
-@@ -294,105 +292,74 @@
- 	fi
- 
- bininstall: all
--	mkdir -p $(DESTDIR)$(MODULES_DIR)
--	mkdir -p $(DESTDIR)$(ASTSBINDIR)
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	mkdir -p $(DESTDIR)$(ASTBINDIR)
--	mkdir -p $(DESTDIR)$(ASTSBINDIR)
--	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
--	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
--	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
-+	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
-+	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
- 	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
--		install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
-+		$(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
- 	fi
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
--	install -d $(DESTDIR)$(ASTHEADERDIR)
--	install -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
-+	$(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
- 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm
--	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail
--	if [ ! -h $(DESTDIR)$(ASTSPOOLDIR)/vm ] && [ -d $(DESTDIR)$(ASTSPOOLDIR)/vm ]; then \
--		mv $(DESTDIR)$(ASTSPOOLDIR)/vm $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \
--	else \
--		mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \
--		rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \
--	fi
--	ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_ixj.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_tor.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_mysql.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_unixodbc.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/codec_mp3_d.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/format_mp3.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/app_voicemail2.so
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
--	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
--	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
--	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/vm . )
--	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
--	@echo " +---- Asterisk Installation Complete -------+"  
--	@echo " +                                           +"
--	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
--	@echo " +                                           +"
--	@echo " + Asterisk has successfully been installed. +"  
--	@echo " + If you would like to install the sample   +"  
--	@echo " + configuration files (overwriting any      +"
--	@echo " + existing config files), run:              +"  
--	@echo " +                                           +"
--	@echo " +               $(MAKE) samples                +"
--	@echo " +                                           +"
--	@echo " +-----------------  or ---------------------+"
--	@echo " +                                           +"
--	@echo " + You can go ahead and install the asterisk +"
--	@echo " + program documentation now or later run:   +"
--	@echo " +                                           +"
--	@echo " +              $(MAKE) progdocs                +"
--	@echo " +                                           +"
--	@echo " + **Note** This requires that you have      +"
--	@echo " + doxygen installed on your local system    +"
--	@echo " +-------------------------------------------+"
-+	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/vm . )
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/voicemail . )
- 
--install: all datafiles bininstall
-+install: all datafiles bininstall samples
- 
- upgrade: all bininstall
- 
- adsi: all
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
- 	for x in configs/*.adsi; do \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x`-dist; \
- 		if ! [ -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \
--			install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
- 		fi ; \
- 	done
- 
- samples: all datafiles adsi
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	for x in configs/*.sample; do \
--		if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
--			mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	for x in configs/*.sample channels/h323/*.sample; do \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\
-+		if ! [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
- 		fi ; \
--		install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
- 	done
--	echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
-+	echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	if ! [ -f $(DESTDIR)$(ASTETCDIR)/asterisk.conf ]; then \
-+		$(BSD_INSTALL_DATA) $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist $(DESTDIR)$(ASTETCDIR)/asterisk.conf; \
-+	fi
- 	for x in sounds/demo-*; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
- 		fi; \
- 	done
- 	for x in sounds/*.mp3; do \
--		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
- 	done
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
- 	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
- 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
- 		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
diff --git a/net/asterisk12/files/patch-agi::Makefile b/net/asterisk12/files/patch-agi::Makefile
deleted file mode 100644
index 567c30f5624e..000000000000
--- a/net/asterisk12/files/patch-agi::Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-
-$FreeBSD$
-
---- agi/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ agi/Makefile	Fri Jan 30 02:31:07 2004
-@@ -11,21 +11,24 @@
- # the GNU General Public License
- #
- 
--AGIS=agi-test.agi eagi-test eagi-sphinx-test
-+AGIS_BIN=eagi-test eagi-sphinx-test
-+AGIS_SCR=agi-test.agi
-+AGIS=$(AGIS_SCR) $(AGIS_BIN)
- 
- CFLAGS+=
- 
- all: depend $(AGIS)
- 
- install: all
--	mkdir -p $(DESTDIR)$(AGI_DIR)
--	for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
-+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
-+	for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done
-+	for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
- 
- eagi-test: eagi-test.o
--	$(CC) -o eagi-test eagi-test.o
-+	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
- 	
- eagi-sphinx-test: eagi-sphinx-test.o
--	$(CC) -o eagi-sphinx-test eagi-sphinx-test.o
-+	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o
- 
- clean:
- 	rm -f *.so *.o look .depend
diff --git a/net/asterisk12/files/patch-apps::Makefile b/net/asterisk12/files/patch-apps::Makefile
deleted file mode 100644
index 901ba694c33a..000000000000
--- a/net/asterisk12/files/patch-apps::Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- apps/Makefile.orig	Mon Jan 12 03:56:38 2004
-+++ apps/Makefile	Fri Jan 30 01:47:34 2004
-@@ -59,17 +59,17 @@
- 	$(CC) $(SOLINK) -o $@ $< -ltonezone
- 
- install: all
--	for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- app_todd.o: app_todd.c
--	gcc -pipe -O6 -g  -Iinclude -I../include -D_REENTRANT -march=i586 -DDO_CRASH -c -o  app_todd.o app_todd.c
-+	$(CC) $(CFLAGS) -Iinclude -I../include -D_REENTRANT -DDO_CRASH -c -o  app_todd.o app_todd.c
- 
- app_todd.so: app_todd.o
--	$(CC) $(SOLINK) -o $@ $< -L/usr/local/ssl/lib -lssl -lcrypto
-+	$(CC) $(SOLINK) -o $@ $< -lssl -lcrypto
- 
- app_voicemail.so : app_voicemail.o
- ifeq ($(USE_MYSQL_VM_INTERFACE),1)
--	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient -lz
-+	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L$(LOCALBASE)/lib/mysql -lmysqlclient -lz
- else
- ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
- 	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq
-@@ -88,7 +88,7 @@
- 	$(CC) $(SOLINK) -o $@ $< -lodbc
- 
- look:	look.c
--	gcc -pipe -O6 -g look.c -o look -lncurses
-+	$(CC) $(CFLAGS) look.c -o look -lncurses
- 
- ifneq ($(wildcard .depend),)
- include .depend
diff --git a/net/asterisk12/files/patch-apps::app_intercom.c b/net/asterisk12/files/patch-apps::app_intercom.c
deleted file mode 100644
index e4ac57f8e31b..000000000000
--- a/net/asterisk12/files/patch-apps::app_intercom.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- apps/app_intercom.c.orig	Wed Oct 22 06:10:24 2003
-+++ apps/app_intercom.c	Fri Jan 30 01:52:03 2004
-@@ -29,7 +29,7 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk12/files/patch-astman::Makefile b/net/asterisk12/files/patch-astman::Makefile
deleted file mode 100644
index cf31005257cf..000000000000
--- a/net/asterisk12/files/patch-astman::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- astman/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ astman/Makefile	Fri Jan 30 01:47:34 2004
-@@ -8,7 +8,7 @@
- install:
- 	if [ "$(TARGET)" != "none" ]; then \
- 		for x in $(TARGET); do \
--			install -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/astman; \
-+			$(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/astman; \
- 		done ; \
- 	fi
- 
diff --git a/net/asterisk12/files/patch-cdr::Makefile b/net/asterisk12/files/patch-cdr::Makefile
deleted file mode 100644
index 2ede608f9019..000000000000
--- a/net/asterisk12/files/patch-cdr::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- cdr/Makefile.orig	Sun Jan 11 21:17:02 2004
-+++ cdr/Makefile	Fri Jan 30 01:47:34 2004
-@@ -43,7 +43,7 @@
- all: depend $(MODS)
- 
- install: all
--	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- clean:
- 	rm -f *.so *.o .depend
diff --git a/net/asterisk12/files/patch-channels::Makefile b/net/asterisk12/files/patch-channels::Makefile
deleted file mode 100644
index d05ee2c13676..000000000000
--- a/net/asterisk12/files/patch-channels::Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-
-$FreeBSD$
-
---- channels/Makefile.orig	Fri Jan 23 22:57:48 2004
-+++ channels/Makefile	Thu Feb 19 01:48:41 2004
-@@ -26,12 +26,10 @@
- #
- #CHANNEL_LIBS+=chan_vofr
- 
--ifneq (${OSARCH},Darwin)
- CHANNEL_LIBS+=chan_oss.so
--endif
- 
- CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
--CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
-+CHANNEL_LIBS+=chan_h323.so
- 
- CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
- CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
-@@ -99,10 +97,8 @@
- 
- chan_oss.o: chan_oss.c  busy.h ringtone.h
- 
--ifeq (${OSARCH},OpenBSD)
- chan_oss.so: chan_oss.o
--	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
--endif
-+	$(CC) $(SOLINK) -o $@ chan_oss.o
- 
- chan_iax2.so: chan_iax2.o iax2-parser.o
- ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -146,15 +142,17 @@
- chan_vpb.so: chan_vpb.o
- 	 $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl
- 
--chan_h323.so: chan_h323.o h323/libchanh323.a
--	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+chan_h323.so: chan_h323.o h323/ast_h323.o
-+	$(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
- 
-+h323/ast_h323.o:
-+	$(MAKE) -C h323 ast_h323.o
- 
- #chan_modem.so : chan_modem.o
- #	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<
- 
- install: all
--	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk12/files/patch-channels::chan_h323.c b/net/asterisk12/files/patch-channels::chan_h323.c
deleted file mode 100644
index e413bd8ecec8..000000000000
--- a/net/asterisk12/files/patch-channels::chan_h323.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_h323.c.orig	Tue Jan 13 11:24:26 2004
-+++ channels/chan_h323.c	Fri Jan 30 01:47:34 2004
-@@ -54,6 +54,7 @@
- #include <fcntl.h>
- #include <netdb.h>
- #include <sys/signal.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- 
- 
diff --git a/net/asterisk12/files/patch-channels::chan_oss.c b/net/asterisk12/files/patch-channels::chan_oss.c
deleted file mode 100644
index 1006b377874e..000000000000
--- a/net/asterisk12/files/patch-channels::chan_oss.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_oss.c.orig	Wed Oct 22 06:10:34 2003
-+++ channels/chan_oss.c	Fri Jan 30 01:50:35 2004
-@@ -36,7 +36,7 @@
- #ifdef __linux
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk12/files/patch-channels::h323::Makefile b/net/asterisk12/files/patch-channels::h323::Makefile
deleted file mode 100644
index a9159b4441c1..000000000000
--- a/net/asterisk12/files/patch-channels::h323::Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-
-$FreeBSD$
-
---- channels/h323/Makefile.orig	Sun Jan 11 04:22:32 2004
-+++ channels/h323/Makefile	Fri Jan 30 01:47:34 2004
-@@ -19,7 +19,7 @@
- #
- # This needs to be updated to deal with more than just little endian machines
- #
--CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
-+CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
- 
- 
- #############################################
-@@ -27,38 +27,39 @@
- # Only change below if you know WTF your doing
- #
- CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
--CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
--CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
-+CFLAGS += -Wall -fPIC
-+CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
- CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
- CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
- CFLAGS += -I../../include
- CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
--CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
-+CFLAGS += -I$(OPENH323DIR)/include
- 
- 
- all:   	libchanh323.a
- 
- samples: 
--	if [ -f $(ASTETCDIR)/h323.conf ]; then \
--		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
-+	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
-+	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
-+		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
- 	fi ; 
--	install h323.conf.sample $(ASTETCDIR)/h323.conf
-  
- 
- ast_h323.o:	ast_h323.cpp
--	g++ -g -c -o $@ $(CFLAGS) $<
-+	$(CXX) -c -o $@ $(CFLAGS) $<
- 
- libchanh323.a:	ast_h323.o
- 	ar cr libchanh323.a ast_h323.o
- 
- chan_h323.so:	
--	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
- 
- chan_h323_d.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
- 
- chan_h323_s.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
-+
- clean:
- 	rm -f *.o *.so core.* libchanh323.a
- 
diff --git a/net/asterisk12/files/patch-codecs::Makefile b/net/asterisk12/files/patch-codecs::Makefile
deleted file mode 100644
index b802dc1233e8..000000000000
--- a/net/asterisk12/files/patch-codecs::Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-
-$FreeBSD$
-
---- codecs/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ codecs/Makefile	Fri Jan 30 01:47:34 2004
-@@ -17,23 +17,22 @@
- # g723.1b)
- #
- #MODG723=codec_g723_1.so codec_g723_1b.so
--MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
--MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
--MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
-+MODG723=codec_g723_1_dummy.so
-+MODG729=codec_g729_dummy.so
-+MODSPEEX=codec_speex.so
- MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
--CFLAGS+=-fPIC
--CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
-+CFLAGS+=-fPIC -I$(LOCALBASE)/include
- 
- LIBG723=g723.1/libg723.a
- LIBG723B=g723.1b/libg723b.a
- LIBGSM=gsm/lib/libgsm.a
- LIBGSMT=gsm/lib/libgsm.a
- LIBLPC10=lpc10/liblpc10.a
--LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib")
-+LIBSPEEX=-L$(LOCALBASE)/lib
- LIBSPEEX+=-lspeex -lm
- LIBILBC=ilbc/libilbc.a
- 
--CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-+CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so
- 
- all: depend $(CODECS)
-@@ -88,7 +87,7 @@
- include .depend
- 
- install: all
--	for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(CODECS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk12/files/patch-codecs::codec_g723_1_dummy.c b/net/asterisk12/files/patch-codecs::codec_g723_1_dummy.c
deleted file mode 100644
index 661ff2d88602..000000000000
--- a/net/asterisk12/files/patch-codecs::codec_g723_1_dummy.c
+++ /dev/null
@@ -1,314 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g723_1_dummy.c	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,308 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Translate between signed linear and G.723.1 (dummy!)
-+ *
-+ * The G.723.1 code is not included in the Asterisk distribution because
-+ * it is covered with patents, and in spite of statements to the contrary,
-+ * the "technology" is extremely expensive to license.
-+ * 
-+ * Copyright (C) 1999, Mark Spencer
-+ *
-+ * Mark Spencer <markster@linux-support.net>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#define TYPE_HIGH	 0x0
-+#define TYPE_LOW	 0x1
-+#define TYPE_SILENCE	 0x2
-+#define TYPE_DONTSEND	 0x3
-+#define TYPE_MASK	 0x3
-+
-+#include <sys/types.h>
-+#include <asterisk/translate.h>
-+#include <asterisk/module.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/channel.h>
-+#include <pthread.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <netinet/in.h>
-+#include <string.h>
-+#include <stdio.h>
-+
-+/* Sample frame data */
-+#include "slin_g723_ex.h"
-+#include "g723_slin_ex.h"
-+
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
-+static int localusecnt=0;
-+
-+static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator";
-+
-+struct g723_encoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Buffer for our outgoing frame */
-+	char outbuf[8000];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+struct g723_decoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+static struct ast_translator_pvt *g723tolin_new()
-+{
-+	struct g723_decoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g723_decoder_pvt));
-+	if (tmp) {
-+		tmp->tail = 0;
-+		localusecnt++;
-+		ast_update_use_count();
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *lintog723_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_SLINEAR;
-+	f.datalen = sizeof(slin_g723_ex);
-+	/* Assume 8000 Hz */
-+	f.samples = sizeof(slin_g723_ex)/16;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = slin_g723_ex;
-+	return &f;
-+}
-+
-+static struct ast_frame *g723tolin_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_G723_1;
-+	f.datalen = sizeof(g723_slin_ex);
-+	/* All frames are 30 ms long */
-+	f.samples = 30;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = g723_slin_ex;
-+	return &f;
-+}
-+
-+static struct ast_translator_pvt *lintog723_new()
-+{
-+	struct g723_encoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g723_encoder_pvt));
-+	if (tmp) {
-+		localusecnt++;
-+		ast_update_use_count();
-+		tmp->tail = 0;
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *g723tolin_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt;
-+	if (!tmp->tail)
-+		return NULL;
-+	/* Signed linear is no particular frame size, so just send whatever
-+	   we have in the buffer in one lump sum */
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_SLINEAR;
-+	tmp->f.datalen = tmp->tail * 2;
-+	/* Assume 8000 Hz */
-+	tmp->f.samples = tmp->tail / 8;
-+	tmp->f.mallocd = 0;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.data = tmp->buf;
-+	/* Reset tail pointer */
-+	tmp->tail = 0;
-+
-+	return &tmp->f;	
-+}
-+
-+static int g723_len(unsigned char buf)
-+{
-+	switch(buf & TYPE_MASK) {
-+	case TYPE_DONTSEND:
-+		return 2;
-+		break;
-+	case TYPE_SILENCE:
-+		return 4;
-+		break;
-+	case TYPE_HIGH:
-+		return 24;
-+		break;
-+	case TYPE_LOW:
-+		return 20;
-+		break;
-+	default:
-+		ast_log(LOG_WARNING, "Badly encoded frame (%d)\n", buf & TYPE_MASK);
-+	}
-+	return -1;
-+}
-+
-+static int g723tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt;
-+	int len = 0;
-+	int res;
-+	while(len < f->datalen) {
-+		/* Assuming there's space left, decode into the current buffer at
-+		   the tail location */
-+		res = g723_len(((unsigned char *)f->data + len)[0]);
-+		if (res < 0) {
-+			ast_log(LOG_WARNING, "Invalid data\n");
-+			return -1;
-+		}
-+		if (res + len > f->datalen) {
-+			ast_log(LOG_WARNING, "Measured length exceeds frame length\n");
-+			return -1;
-+		}
-+		if (tmp->tail + 480 < sizeof(tmp->buf)/2) {	
-+			memset(tmp->buf + tmp->tail, 0, 480);
-+			tmp->tail+=480;
-+		} else {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return -1;
-+		}
-+		len += res;
-+	}
-+	return 0;
-+}
-+
-+static int lintog723_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	/* Just add the frames to our stream */
-+	/* XXX We should look at how old the rest of our stream is, and if it
-+	   is too old, then we should overwrite it entirely, otherwise we can
-+	   get artifacts of earlier talk that do not belong */
-+	struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt;
-+	if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) {
-+		memcpy(&tmp->buf[tmp->tail], f->data, f->datalen);
-+		tmp->tail += f->datalen/2;
-+	} else {
-+		ast_log(LOG_WARNING, "Out of buffer space\n");
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static struct ast_frame *lintog723_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt;
-+	int cnt=0;
-+	/* We can't work on anything less than a frame in size */
-+	if (tmp->tail < 480)
-+		return NULL;
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_G723_1;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.samples = 0;
-+	tmp->f.mallocd = 0;
-+	while(tmp->tail >= 480) {
-+		/* Encode a frame of data */
-+		if (cnt + 24 >= sizeof(tmp->outbuf)) {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return NULL;
-+		}
-+		memset(tmp->outbuf + cnt, 0, 24);
-+		/* Assume 8000 Hz */
-+		tmp->f.samples += 30;
-+		cnt += 24;
-+		tmp->tail -= 480;
-+		/* Move the data at the end of the buffer to the front */
-+		if (tmp->tail)
-+			memmove(tmp->buf, tmp->buf + 480, tmp->tail * 2);
-+	}
-+	tmp->f.datalen = cnt;
-+	tmp->f.data = tmp->outbuf;
-+	return &tmp->f;	
-+}
-+
-+static void g723_destroy(struct ast_translator_pvt *pvt)
-+{
-+	free(pvt);
-+	localusecnt--;
-+	ast_update_use_count();
-+}
-+
-+static struct ast_translator g723tolin =
-+	{ "g723tolin_dummy", 
-+	   AST_FORMAT_G723_1, AST_FORMAT_SLINEAR,
-+	   g723tolin_new,
-+	   g723tolin_framein,
-+	   g723tolin_frameout,
-+	   g723_destroy,
-+	   g723tolin_sample
-+	   };
-+
-+static struct ast_translator lintog723 =
-+	{ "lintog723_dummy", 
-+	   AST_FORMAT_SLINEAR, AST_FORMAT_G723_1,
-+	   lintog723_new,
-+	   lintog723_framein,
-+	   lintog723_frameout,
-+	   g723_destroy,
-+	   lintog723_sample
-+	   };
-+
-+int unload_module(void)
-+{
-+	int res;
-+	ast_mutex_lock(&localuser_lock);
-+	res = ast_unregister_translator(&lintog723);
-+	if (!res)
-+		res = ast_unregister_translator(&g723tolin);
-+	if (localusecnt)
-+		res = -1;
-+	ast_mutex_unlock(&localuser_lock);
-+	return res;
-+}
-+
-+int load_module(void)
-+{
-+	int res;
-+	res=ast_register_translator(&g723tolin);
-+	if (!res) 
-+		res=ast_register_translator(&lintog723);
-+	else
-+		ast_unregister_translator(&g723tolin);
-+	return res;
-+}
-+
-+char *description(void)
-+{
-+	return tdesc;
-+}
-+
-+int usecount(void)
-+{
-+	int res;
-+	STANDARD_USECOUNT(res);
-+	return res;
-+}
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk12/files/patch-codecs::codec_g729_dummy.c b/net/asterisk12/files/patch-codecs::codec_g729_dummy.c
deleted file mode 100644
index c3e27d98e27e..000000000000
--- a/net/asterisk12/files/patch-codecs::codec_g729_dummy.c
+++ /dev/null
@@ -1,281 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g729_dummy.c	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,275 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Translate between signed linear and G.729 (dummy!)
-+ *
-+ * The G.729 code is not included in the Asterisk distribution because
-+ * it is covered with patents, and in spite of statements to the contrary,
-+ * the "technology" is extremely expensive to license.
-+ * 
-+ * Copyright (C) 1999, Mark Spencer
-+ *
-+ * Mark Spencer <markster@linux-support.net>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#include <sys/types.h>
-+#include <asterisk/translate.h>
-+#include <asterisk/module.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/channel.h>
-+#include <pthread.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <netinet/in.h>
-+#include <string.h>
-+#include <stdio.h>
-+
-+/* Sample frame data */
-+#include "slin_g729_ex.h"
-+#include "g729_slin_ex.h"
-+
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
-+static int localusecnt=0;
-+
-+static char *tdesc = "Dummy G.729/PCM16 Codec Translator";
-+
-+struct g729_encoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Buffer for our outgoing frame */
-+	char outbuf[8000];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+struct g729_decoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+static struct ast_translator_pvt *g729tolin_new()
-+{
-+	struct g729_decoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g729_decoder_pvt));
-+	if (tmp) {
-+		tmp->tail = 0;
-+		localusecnt++;
-+		ast_update_use_count();
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *lintog729_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_SLINEAR;
-+	f.datalen = sizeof(slin_g729_ex);
-+	/* Assume 8000 Hz */
-+	f.samples = sizeof(slin_g729_ex)/16;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = slin_g729_ex;
-+	return &f;
-+}
-+
-+static struct ast_frame *g729tolin_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_G729A;
-+	f.datalen = sizeof(g729_slin_ex);
-+	/* All frames are 10 ms long */
-+	f.samples = 10;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = g729_slin_ex;
-+	return &f;
-+}
-+
-+static struct ast_translator_pvt *lintog729_new()
-+{
-+	struct g729_encoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g729_encoder_pvt));
-+	if (tmp) {
-+		localusecnt++;
-+		ast_update_use_count();
-+		tmp->tail = 0;
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *g729tolin_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt;
-+	if (!tmp->tail)
-+		return NULL;
-+	/* Signed linear is no particular frame size, so just send whatever
-+	   we have in the buffer in one lump sum */
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_SLINEAR;
-+	tmp->f.datalen = tmp->tail * 2;
-+	/* Assume 8000 Hz */
-+	tmp->f.samples = tmp->tail / 8;
-+	tmp->f.mallocd = 0;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.data = tmp->buf;
-+	/* Reset tail pointer */
-+	tmp->tail = 0;
-+
-+	return &tmp->f;	
-+}
-+
-+static int g729tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt;
-+	int len = 0;
-+	while(len < f->datalen) {
-+		/* Assuming there's space left, decode into the current buffer at
-+		   the tail location */
-+		if (10 + len > f->datalen) {
-+			ast_log(LOG_WARNING, "Measured length exceeds frame length\n");
-+			return -1;
-+		}
-+		if (tmp->tail + 160 < sizeof(tmp->buf)/2) {	
-+			memset(tmp->buf + tmp->tail, 0, 160);
-+			tmp->tail+=160;
-+		} else {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return -1;
-+		}
-+		len += 10;
-+	}
-+	return 0;
-+}
-+
-+static int lintog729_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	/* Just add the frames to our stream */
-+	/* XXX We should look at how old the rest of our stream is, and if it
-+	   is too old, then we should overwrite it entirely, otherwise we can
-+	   get artifacts of earlier talk that do not belong */
-+	struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt;
-+	if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) {
-+		memcpy(&tmp->buf[tmp->tail], f->data, f->datalen);
-+		tmp->tail += f->datalen/2;
-+	} else {
-+		ast_log(LOG_WARNING, "Out of buffer space\n");
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static struct ast_frame *lintog729_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt;
-+	int cnt=0;
-+	/* We can't work on anything less than a frame in size */
-+	if (tmp->tail < 160)
-+		return NULL;
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_G729A;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.samples = 0;
-+	tmp->f.mallocd = 0;
-+	while(tmp->tail >= 160) {
-+		/* Encode a frame of data */
-+		if (cnt + 10 >= sizeof(tmp->outbuf)) {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return NULL;
-+		}
-+		memset(tmp->outbuf + cnt, 0, 10);
-+		/* Assume 8000 Hz */
-+		tmp->f.samples += 10;
-+		cnt += 10;
-+		tmp->tail -= 160;
-+		/* Move the data at the end of the buffer to the front */
-+		if (tmp->tail)
-+			memmove(tmp->buf, tmp->buf + 160, tmp->tail * 2);
-+	}
-+	tmp->f.datalen = cnt;
-+	tmp->f.data = tmp->outbuf;
-+	return &tmp->f;	
-+}
-+
-+static void g729_destroy(struct ast_translator_pvt *pvt)
-+{
-+	free(pvt);
-+	localusecnt--;
-+	ast_update_use_count();
-+}
-+
-+static struct ast_translator g729tolin =
-+	{ "g729tolin_dummy", 
-+	   AST_FORMAT_G729A, AST_FORMAT_SLINEAR,
-+	   g729tolin_new,
-+	   g729tolin_framein,
-+	   g729tolin_frameout,
-+	   g729_destroy,
-+	   g729tolin_sample
-+	   };
-+
-+static struct ast_translator lintog729 =
-+	{ "lintog729_dummy", 
-+	   AST_FORMAT_SLINEAR, AST_FORMAT_G729A,
-+	   lintog729_new,
-+	   lintog729_framein,
-+	   lintog729_frameout,
-+	   g729_destroy,
-+	   lintog729_sample
-+	   };
-+
-+int unload_module(void)
-+{
-+	int res;
-+	ast_mutex_lock(&localuser_lock);
-+	res = ast_unregister_translator(&lintog729);
-+	if (!res)
-+		res = ast_unregister_translator(&g729tolin);
-+	if (localusecnt)
-+		res = -1;
-+	ast_mutex_unlock(&localuser_lock);
-+	return res;
-+}
-+
-+int load_module(void)
-+{
-+	int res;
-+	res=ast_register_translator(&g729tolin);
-+	if (!res) 
-+		res=ast_register_translator(&lintog729);
-+	else
-+		ast_unregister_translator(&g729tolin);
-+	return res;
-+}
-+
-+char *description(void)
-+{
-+	return tdesc;
-+}
-+
-+int usecount(void)
-+{
-+	int res;
-+	STANDARD_USECOUNT(res);
-+	return res;
-+}
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk12/files/patch-codecs::g729_slin_ex.h b/net/asterisk12/files/patch-codecs::g729_slin_ex.h
deleted file mode 100644
index 44e60f2de848..000000000000
--- a/net/asterisk12/files/patch-codecs::g729_slin_ex.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/g729_slin_ex.h	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,14 @@
-+/*
-+ * g729_slin_ex.h --
-+ *
-+ *      8-bit G.729 data, 10 milliseconds worth at 8 kHz.
-+ *
-+ * Copyright (C) 2004, Maxim Sobolev <sobomax@FreeBSD.org>
-+ *
-+ * Distributed under the terms of the GNU General Public License
-+ *
-+ */
-+
-+static unsigned char g729_slin_ex[] = {
-+120,82,175,64,0,250,219,0,7,214
-+};
diff --git a/net/asterisk12/files/patch-codecs::gsm::Makefile b/net/asterisk12/files/patch-codecs::gsm::Makefile
deleted file mode 100644
index d60ed11f3298..000000000000
--- a/net/asterisk12/files/patch-codecs::gsm::Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- codecs/gsm/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/gsm/Makefile	Fri Jan 30 01:47:34 2004
-@@ -60,8 +60,8 @@
- # CC		= /usr/lang/acc
- # CCFLAGS 	= -c -O
- 
--CC		= gcc $(OPTIMIZE) -fomit-frame-pointer 
--CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
-+CC		?= gcc
-+CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer
- 
- LD 		= $(CC)
- 
-@@ -146,7 +146,7 @@
- DEBUG	= -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
- 
--CFLAGS	= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
-+CFLAGS	+= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
- 	$(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC)
- ######### It's $(CC) $(CFLAGS)
- 
diff --git a/net/asterisk12/files/patch-codecs::ilbc::Makefile b/net/asterisk12/files/patch-codecs::ilbc::Makefile
deleted file mode 100644
index 7770e07550a4..000000000000
--- a/net/asterisk12/files/patch-codecs::ilbc::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-
-$FreeBSD$
-
---- codecs/ilbc/Makefile.orig	Sun Apr 27 21:13:11 2003
-+++ codecs/ilbc/Makefile	Fri Jan 30 01:47:34 2004
-@@ -1,4 +1,4 @@
--CFLAGS+= -fPIC -O3
-+CFLAGS+= -fPIC
- LIB=libilbc.a
- 
- OBJS= anaFilter.o iCBSearch.o packing.o \
diff --git a/net/asterisk12/files/patch-codecs::lpc10::Makefile b/net/asterisk12/files/patch-codecs::lpc10::Makefile
deleted file mode 100644
index 68c98c064f70..000000000000
--- a/net/asterisk12/files/patch-codecs::lpc10::Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD$
-
---- codecs/lpc10/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/lpc10/Makefile	Fri Jan 30 02:06:54 2004
-@@ -3,7 +3,7 @@
- # 
- 
- # default C compiler
--CC= gcc
-+CC?= gcc
- 
- # 
- # These definitions for CFLAGS and LIB_TARGET_DIR are used when one
-@@ -22,14 +22,14 @@
- # 
- 
- WARNINGS = -Wall -Wno-comment -Wno-error
--CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
-+CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
- #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
- 
- #fix for PPC processors
- ifneq ($(OSARCH),Darwin)
- ifneq ($(PROC),ppc)
- ifneq ($(PROC),x86_64)
--	CFLAGS+= -march=$(PROC)
-+	CFLAGS+= 
- endif
- endif
- endif
diff --git a/net/asterisk12/files/patch-codecs::slin_g729_ex.h b/net/asterisk12/files/patch-codecs::slin_g729_ex.h
deleted file mode 100644
index e1236d2498dc..000000000000
--- a/net/asterisk12/files/patch-codecs::slin_g729_ex.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/slin_g729_ex.h	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,25 @@
-+/*
-+ * slin_g729_ex.h --
-+ *
-+ *	Signed 16-bit audio data, 10 milliseconds worth at 8 kHz.
-+ *
-+ * Source: g723.example
-+ *
-+ * Copyright (C) 2001, Linux Support Services, Inc.
-+ *
-+ * Distributed under the terms of the GNU General Public License
-+ *
-+ */
-+
-+static signed short slin_g729_ex[] = {
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
-+};
diff --git a/net/asterisk12/files/patch-db.c b/net/asterisk12/files/patch-db.c
deleted file mode 100644
index 59e5cef87770..000000000000
--- a/net/asterisk12/files/patch-db.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- db.c.orig	Tue Dec  2 17:12:56 2003
-+++ db.c	Fri Jan 30 01:47:34 2004
-@@ -32,7 +32,7 @@
- #include <asterisk/options.h>
- #include <asterisk/astdb.h>
- #include <asterisk/cli.h>
--#include "db1-ast/include/db.h"
-+#include <db.h>
- #include "asterisk.h"
- #include "astconf.h"
- 
diff --git a/net/asterisk12/files/patch-editline::configure b/net/asterisk12/files/patch-editline::configure
deleted file mode 100644
index f6b9c5b76eee..000000000000
--- a/net/asterisk12/files/patch-editline::configure
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- editline/configure.orig	Sun Apr 27 21:13:11 2003
-+++ editline/configure	Fri Jan 30 01:47:34 2004
-@@ -1906,7 +1906,7 @@
-   CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG"
-   CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE"
- else
--  CFLAGS="$CFLAGS -O"
-+  CFLAGS="$CFLAGS"
- fi
- 
- 
diff --git a/net/asterisk12/files/patch-formats::Makefile b/net/asterisk12/files/patch-formats::Makefile
deleted file mode 100644
index dacfd7b08303..000000000000
--- a/net/asterisk12/files/patch-formats::Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- formats/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ formats/Makefile	Fri Jan 30 01:47:34 2004
-@@ -18,7 +18,7 @@
- #
- # G723 simple frame is depricated
- #
--#FORMAT_LIBS+=format_g723.so
-+FORMAT_LIBS+=format_g723_1.so
- 
- GSMLIB=../codecs/gsm/lib/libgsm.a
- 
-@@ -40,7 +40,7 @@
- 	$(CC) $(SOLINK) -o $@ $< -lm
- 
- install: all
--	for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(FORMAT_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk12/files/patch-formats::format_g723_1.c b/net/asterisk12/files/patch-formats::format_g723_1.c
deleted file mode 100644
index 8d0755e14205..000000000000
--- a/net/asterisk12/files/patch-formats::format_g723_1.c
+++ /dev/null
@@ -1,351 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ formats/format_g723_1.c	Fri Jan 30 01:58:19 2004
-@@ -0,0 +1,345 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Save and read raw, headerless G723.1 Annex A data.
-+ *
-+ * Copyright (C) 1999, Mark Spencer <markster@linux-support.net>
-+ * Copyright (C) 2003, Maxim Sobolev <sobomax@FreeBSD.org>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#include <asterisk/lock.h>
-+#include <asterisk/channel.h>
-+#include <asterisk/file.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/sched.h>
-+#include <asterisk/module.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <stdlib.h>
-+#include <sys/time.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#include <string.h>
-+#include <pthread.h>
-+#ifdef __linux__
-+#include <endian.h>
-+#else
-+#include <machine/endian.h>
-+#endif
-+
-+/* Based on format_g729.c */
-+
-+#define TYPE_HIGH	0x0
-+#define TYPE_LOW	0x1
-+#define TYPE_SILENCE	0x2
-+#define TYPE_DONTSEND	0x3
-+#define TYPE_MASK	0x3
-+
-+struct ast_filestream {
-+	void *reserved[AST_RESERVED_POINTERS];
-+	/* This is what a filestream means to us */
-+	int fd; 				/* Descriptor */
-+	struct ast_frame fr;			/* Frame information */
-+	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
-+	char empty;				/* Empty character */
-+	unsigned char g723[24];			/* One Real G723.1 Frame */
-+};
-+
-+static long g723_tell(struct ast_filestream *);
-+
-+static ast_mutex_t g723_lock = AST_MUTEX_INITIALIZER;
-+static int glistcnt = 0;
-+
-+static char *name = "g723";
-+static char *desc = "Raw G723.1 Annex A data";
-+static char *exts = "g723";
-+
-+static int g723_len(unsigned char buf)
-+{
-+	switch(buf & TYPE_MASK) {
-+	case TYPE_DONTSEND:
-+		return 2;
-+		break;
-+	case TYPE_SILENCE:
-+		return 4;
-+		break;
-+	case TYPE_HIGH:
-+		return 24;
-+		break;
-+	case TYPE_LOW:
-+		return 20;
-+		break;
-+	default:
-+		ast_log(LOG_WARNING, "Badly encoded G723.1 frame (%d)\n", buf & TYPE_MASK);
-+	}
-+	return -1;
-+}
-+
-+static struct ast_filestream *g723_open(int fd)
-+{
-+	/* We don't have any header to read or anything really, but
-+	   if we did, it would go here.  We also might want to check
-+	   and be sure it's a valid file.  */
-+	struct ast_filestream *tmp;
-+	if ((tmp = malloc(sizeof(struct ast_filestream)))) {
-+		memset(tmp, 0, sizeof(struct ast_filestream));
-+		if (ast_mutex_lock(&g723_lock)) {
-+			ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+			free(tmp);
-+			return NULL;
-+		}
-+		tmp->fd = fd;
-+		tmp->fr.data = tmp->g723;
-+		tmp->fr.frametype = AST_FRAME_VOICE;
-+		tmp->fr.subclass = AST_FORMAT_G723_1;
-+		/* datalen will vary for each frame */
-+		tmp->fr.src = name;
-+		tmp->fr.mallocd = 0;
-+		glistcnt++;
-+		ast_mutex_unlock(&g723_lock);
-+		ast_update_use_count();
-+	}
-+	return tmp;
-+}
-+
-+static struct ast_filestream *g723_rewrite(int fd, char *comment)
-+{
-+	/* We don't have any header to read or anything really, but
-+	   if we did, it would go here.  We also might want to check
-+	   and be sure it's a valid file.  */
-+	struct ast_filestream *tmp;
-+	if ((tmp = malloc(sizeof(struct ast_filestream)))) {
-+		memset(tmp, 0, sizeof(struct ast_filestream));
-+		if (ast_mutex_lock(&g723_lock)) {
-+			ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+			free(tmp);
-+			return NULL;
-+		}
-+		tmp->fd = fd;
-+		glistcnt++;
-+		ast_mutex_unlock(&g723_lock);
-+		ast_update_use_count();
-+	} else
-+		ast_log(LOG_WARNING, "Out of memory\n");
-+	return tmp;
-+}
-+
-+static void g723_close(struct ast_filestream *s)
-+{
-+	if (ast_mutex_lock(&g723_lock)) {
-+		ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+		return;
-+	}
-+	glistcnt--;
-+	ast_mutex_unlock(&g723_lock);
-+	ast_update_use_count();
-+	close(s->fd);
-+	free(s);
-+	s = NULL;
-+}
-+
-+static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext)
-+{
-+	int res;
-+	/* Send a frame from the file to the appropriate channel */
-+	s->fr.frametype = AST_FRAME_VOICE;
-+	s->fr.subclass = AST_FORMAT_G723_1;
-+	s->fr.offset = AST_FRIENDLY_OFFSET;
-+	s->fr.samples = 240;
-+	s->fr.mallocd = 0;
-+	s->fr.data = s->g723;
-+	if ((res = read(s->fd, s->g723, 1)) != 1) {
-+		if (res)
-+			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
-+		return NULL;
-+	}
-+	s->fr.datalen = g723_len(s->g723[0]);
-+	if (s->fr.datalen < 0) {
-+		ast_log(LOG_WARNING, "Invalid G723.1 frame!\n");
-+		return NULL;
-+	}
-+	if (s->fr.datalen > 1 && (res = read(s->fd, s->g723 + 1, s->fr.datalen - 1)) != s->fr.datalen - 1) {
-+		if (res)
-+			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
-+		return NULL;
-+	}
-+	*whennext = s->fr.samples;
-+	return &s->fr;
-+}
-+
-+static int g723_write(struct ast_filestream *fs, struct ast_frame *f)
-+{
-+	int res;
-+	unsigned char *cp;
-+	if (f->frametype != AST_FRAME_VOICE) {
-+		ast_log(LOG_WARNING, "Asked to write non-voice frame!\n");
-+		return -1;
-+	}
-+	if (f->subclass != AST_FORMAT_G723_1) {
-+		ast_log(LOG_WARNING, "Asked to write non-G723.1 frame (%d)!\n", f->subclass);
-+		return -1;
-+	}
-+	for (cp = f->data; cp < (unsigned char *)f->data + f->datalen; cp += res) {
-+		res = g723_len(cp[0]);
-+		if (res < 0) {
-+			ast_log(LOG_WARNING, "Asked to write invalid G723.1 frame!\n");
-+			return -1;
-+		}
-+	}
-+	if (cp != (unsigned char *)f->data + f->datalen) {
-+		ast_log(LOG_WARNING, "Invalid G723.1 data length, %d\n", f->datalen);
-+		return -1;
-+	}
-+	if ((res = write(fs->fd, f->data, f->datalen)) != f->datalen) {
-+		ast_log(LOG_WARNING, "Bad write %d: %s\n", res, strerror(errno));
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static char *g723_getcomment(struct ast_filestream *s)
-+{
-+	return NULL;
-+}
-+
-+static int g723_seek(struct ast_filestream *fs, long sample_offset, int whence)
-+{
-+	long cur, offset, max;
-+	off_t coffset, moffset, soffset;
-+	int res;
-+	unsigned char c;
-+
-+	offset = 0;	/* Shut up gcc warning */
-+	if (whence == SEEK_SET) {
-+		offset = sample_offset;
-+	} else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) {
-+		if ((cur = g723_tell(fs)) == -1) {
-+			ast_log(LOG_WARNING, "Can't get current position!\n");
-+			return -1;
-+		}
-+		offset = cur + sample_offset;
-+	}
-+	if ((moffset = lseek(fs->fd, 0, SEEK_END)) == -1) {
-+		ast_log(LOG_WARNING, "Can't seek stream to an end!\n");
-+		return -1;
-+	}
-+	if (whence == SEEK_END) {
-+		if ((max = g723_tell(fs)) == -1) {
-+			ast_log(LOG_WARNING, "Can't get maximum position!\n");
-+			return -1;
-+		}
-+		offset = max - sample_offset;
-+	}
-+	if (offset < 0)
-+		offset = 0;
-+	soffset = -1;
-+	for (coffset = 0; coffset < moffset && offset > 0; coffset += res) {
-+		if (lseek(fs->fd, coffset, SEEK_SET) != coffset) {
-+			ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		if (read(fs->fd, &c, 1) != 1) {
-+			ast_log(LOG_WARNING, "Can't read from offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		soffset = coffset;
-+		if ((res = g723_len(c)) < 0) {
-+			ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		if (res > 1)
-+			offset -= 240;
-+	}
-+	if (soffset != -1 && lseek(fs->fd, soffset, SEEK_SET) != soffset) {
-+		ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", soffset);
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+static int g723_trunc(struct ast_filestream *fs)
-+{
-+	/* Truncate file to current length */
-+	if (ftruncate(fs->fd, lseek(fs->fd, 0, SEEK_CUR)) < 0)
-+		return -1;
-+	return 0;
-+}
-+
-+static long g723_tell(struct ast_filestream *fs)
-+{
-+	off_t offset, coffset;
-+	int res;
-+	long rval;
-+	unsigned char c;
-+
-+	offset = lseek(fs->fd, 0, SEEK_CUR);
-+	rval = 0;
-+	for (coffset = 0; coffset < offset; coffset += res) {
-+		if (lseek(fs->fd, coffset, SEEK_SET) != coffset) {
-+			ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if (read(fs->fd, &c, 1) != 1) {
-+			ast_log(LOG_WARNING, "Can't read from offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if ((res = g723_len(c)) < 0) {
-+			ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if (res > 1)
-+			rval += 240;
-+	}
-+	if (lseek(fs->fd, offset, SEEK_SET) != offset) {
-+		ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", offset);
-+		return -1;
-+	}
-+	return rval;
-+}
-+
-+int load_module()
-+{
-+	return ast_format_register(name, exts, AST_FORMAT_G723_1,
-+				   g723_open,
-+				   g723_rewrite,
-+				   g723_write,
-+				   g723_seek,
-+				   g723_trunc,
-+				   g723_tell,
-+				   g723_read,
-+				   g723_close,
-+				   g723_getcomment);
-+}
-+
-+int unload_module()
-+{
-+	return ast_format_unregister(name);
-+}
-+
-+int usecount()
-+{
-+	int res;
-+	if (ast_mutex_lock(&g723_lock)) {
-+		ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+		return -1;
-+	}
-+	res = glistcnt;
-+	ast_mutex_unlock(&g723_lock);
-+	return res;
-+}
-+
-+char *description()
-+{
-+	return desc;
-+}
-+
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk12/files/patch-formats::format_g729.c b/net/asterisk12/files/patch-formats::format_g729.c
deleted file mode 100644
index a144d1b0f6bf..000000000000
--- a/net/asterisk12/files/patch-formats::format_g729.c
+++ /dev/null
@@ -1,47 +0,0 @@
-
-$FreeBSD$
-
---- formats/format_g729.c.orig	Wed Jan 28 23:32:48 2004
-+++ formats/format_g729.c	Thu Feb 19 01:03:30 2004
-@@ -45,7 +45,7 @@
- 	struct ast_frame fr;				/* Frame information */
- 	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
- 	char empty;							/* Empty character */
--	unsigned char g729[20];				/* Two Real G729 Frames */
-+	unsigned char g729[10];				/* One Real G729 Frame */
- };
- 
- 
-@@ -126,11 +126,11 @@
- 	s->fr.frametype = AST_FRAME_VOICE;
- 	s->fr.subclass = AST_FORMAT_G729A;
- 	s->fr.offset = AST_FRIENDLY_OFFSET;
--	s->fr.samples = 160;
--	s->fr.datalen = 20;
-+	s->fr.samples = 80;
-+	s->fr.datalen = 10;
- 	s->fr.mallocd = 0;
- 	s->fr.data = s->g729;
--	if ((res = read(s->fd, s->g729, 20)) != 20) {
-+	if ((res = read(s->fd, s->g729, 10)) != 10) {
- 		if (res)
- 			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
- 		return NULL;
-@@ -174,7 +174,7 @@
- 	cur = lseek(fs->fd, 0, SEEK_CUR);
- 	max = lseek(fs->fd, 0, SEEK_END);
- 	
--	bytes = 20 * (sample_offset / 160);
-+	bytes = 10 * (sample_offset / 80);
- 	if (whence == SEEK_SET)
- 		offset = bytes;
- 	else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
-@@ -202,7 +202,7 @@
- {
- 	off_t offset;
- 	offset = lseek(fs->fd, 0, SEEK_CUR);
--	return (offset/20)*160;
-+	return (offset/10)*80;
- }
- 
- int load_module()
diff --git a/net/asterisk12/files/patch-pbx::Makefile b/net/asterisk12/files/patch-pbx::Makefile
deleted file mode 100644
index dca6672c389a..000000000000
--- a/net/asterisk12/files/patch-pbx::Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- pbx/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ pbx/Makefile	Fri Jan 30 01:47:34 2004
-@@ -16,7 +16,7 @@
- PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so     # pbx_gtkconsole.so pbx_kdeconsole.so
- 
- # Add GTK console if appropriate
--PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
-+#PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
- # Add KDE Console if appropriate
- #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so")
- 
-@@ -62,7 +62,7 @@
- endif
- 
- install: all
--	for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(PBX_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk12/files/patch-res::Makefile b/net/asterisk12/files/patch-res::Makefile
deleted file mode 100644
index ccd0a35dd59d..000000000000
--- a/net/asterisk12/files/patch-res::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- res/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ res/Makefile	Fri Jan 30 01:47:34 2004
-@@ -25,7 +25,7 @@
- all: depend $(MODS)
- 
- install: all
--	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- res_crypto.so: res_crypto.o
- 	$(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS)
diff --git a/net/asterisk12/pkg-descr b/net/asterisk12/pkg-descr
deleted file mode 100644
index 28b7a1deb011..000000000000
--- a/net/asterisk12/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
-sense, middleware between Internet and telephony channels on the bottom,
-and Internet and telephony applications at the top.
-
-WWW: http://www.asteriskpbx.com
diff --git a/net/asterisk12/pkg-plist b/net/asterisk12/pkg-plist
deleted file mode 100644
index ab3eff23ff6e..000000000000
--- a/net/asterisk12/pkg-plist
+++ /dev/null
@@ -1,462 +0,0 @@
-@unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi
-etc/asterisk/adsi.conf-dist
-@exec [ -f %B/adsi.conf ] || cp %B/%f %B/adsi.conf
-@unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi
-etc/asterisk/adtranvofr.conf-dist
-@exec [ -f %B/adtranvofr.conf ] || cp %B/%f %B/adtranvofr.conf
-@unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi
-etc/asterisk/agents.conf-dist
-@exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf
-@unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi
-etc/asterisk/alsa.conf-dist
-@exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf
-@unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi
-etc/asterisk/asterisk.adsi-dist
-@exec [ -f %B/asterisk.adsi ] || cp %B/%f %B/asterisk.adsi
-@unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi
-etc/asterisk/asterisk.conf-dist
-@exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf
-@unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi
-etc/asterisk/cdr_odbc.conf-dist
-@exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf
-@unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi
-etc/asterisk/cdr_pgsql.conf-dist
-@exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf
-@unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi
-etc/asterisk/enum.conf-dist
-@exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf
-@unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi
-etc/asterisk/extensions.conf-dist
-@exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf
-@unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
-etc/asterisk/festival.conf-dist
-@exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
-@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
-etc/asterisk/h323.conf-dist
-@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.conf
-@unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
-etc/asterisk/iax.conf-dist
-@exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
-@unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi
-etc/asterisk/indications.conf-dist
-@exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf
-@unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi
-etc/asterisk/logger.conf-dist
-@exec [ -f %B/logger.conf ] || cp %B/%f %B/logger.conf
-@unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi
-etc/asterisk/manager.conf-dist
-@exec [ -f %B/manager.conf ] || cp %B/%f %B/manager.conf
-@unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi
-etc/asterisk/meetme.conf-dist
-@exec [ -f %B/meetme.conf ] || cp %B/%f %B/meetme.conf
-@unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi
-etc/asterisk/mgcp.conf-dist
-@exec [ -f %B/mgcp.conf ] || cp %B/%f %B/mgcp.conf
-@unexec if cmp -s %D/etc/asterisk/modem.conf %D/etc/asterisk/modem.conf-dist; then rm -f %D/etc/asterisk/modem.conf; fi
-etc/asterisk/modem.conf-dist
-@exec [ -f %B/modem.conf ] || cp %B/%f %B/modem.conf
-@unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi
-etc/asterisk/modules.conf-dist
-@exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf
-@unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi
-etc/asterisk/musiconhold.conf-dist
-@exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf
-@unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi
-etc/asterisk/oss.conf-dist
-@exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf
-@unexec if cmp -s %D/etc/asterisk/parking.conf %D/etc/asterisk/parking.conf-dist; then rm -f %D/etc/asterisk/parking.conf; fi
-etc/asterisk/parking.conf-dist
-@exec [ -f %B/parking.conf ] || cp %B/%f %B/parking.conf
-@unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi
-etc/asterisk/phone.conf-dist
-@exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf
-@unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi
-etc/asterisk/privacy.conf-dist
-@exec [ -f %B/privacy.conf ] || cp %B/%f %B/privacy.conf
-@unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi
-etc/asterisk/queues.conf-dist
-@exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf
-@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi
-etc/asterisk/rpt.conf-dist
-@exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf
-@unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi
-etc/asterisk/rtp.conf-dist
-@exec [ -f %B/rtp.conf ] || cp %B/%f %B/rtp.conf
-@unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi
-etc/asterisk/sip.conf-dist
-@exec [ -f %B/sip.conf ] || cp %B/%f %B/sip.conf
-@unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi
-etc/asterisk/skinny.conf-dist
-@exec [ -f %B/skinny.conf ] || cp %B/%f %B/skinny.conf
-@unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi
-etc/asterisk/telcordia-1.adsi-dist
-@exec [ -f %B/telcordia-1.adsi ] || cp %B/%f %B/telcordia-1.adsi
-@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi
-etc/asterisk/voicemail.conf-dist
-@exec [ -f %B/voicemail.conf ] || cp %B/%f %B/voicemail.conf
-@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi
-etc/asterisk/vpb.conf-dist
-@exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf
-@unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi
-etc/asterisk/zapata.conf-dist
-@exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf
-include/asterisk/acl.h
-include/asterisk/adsi.h
-include/asterisk/aes.h
-include/asterisk/alaw.h
-include/asterisk/app.h
-include/asterisk/ast_expr.h
-include/asterisk/astdb.h
-include/asterisk/astmm.h
-include/asterisk/callerid.h
-include/asterisk/causes.h
-include/asterisk/cdr.h
-include/asterisk/channel.h
-include/asterisk/channel_pvt.h
-include/asterisk/chanvars.h
-include/asterisk/cli.h
-include/asterisk/config.h
-include/asterisk/crypto.h
-include/asterisk/cvsid.h
-include/asterisk/dlfcn-compat.h
-include/asterisk/dns.h
-include/asterisk/dsp.h
-include/asterisk/enum.h
-include/asterisk/file.h
-include/asterisk/frame.h
-include/asterisk/fskmodem.h
-include/asterisk/image.h
-include/asterisk/indications.h
-include/asterisk/io.h
-include/asterisk/linkedlists.h
-include/asterisk/localtime.h
-include/asterisk/lock.h
-include/asterisk/logger.h
-include/asterisk/manager.h
-include/asterisk/md5.h
-include/asterisk/module.h
-include/asterisk/monitor.h
-include/asterisk/musiconhold.h
-include/asterisk/options.h
-include/asterisk/parking.h
-include/asterisk/pbx.h
-include/asterisk/poll-compat.h
-include/asterisk/privacy.h
-include/asterisk/rtp.h
-include/asterisk/say.h
-include/asterisk/sched.h
-include/asterisk/srv.h
-include/asterisk/tdd.h
-include/asterisk/term.h
-include/asterisk/translate.h
-include/asterisk/ulaw.h
-include/asterisk/vmodem.h
-lib/asterisk/modules/app_adsiprog.so
-lib/asterisk/modules/app_agi.so
-lib/asterisk/modules/app_authenticate.so
-lib/asterisk/modules/app_cdr.so
-lib/asterisk/modules/app_chanisavail.so
-lib/asterisk/modules/app_cut.so
-lib/asterisk/modules/app_datetime.so
-lib/asterisk/modules/app_db.so
-lib/asterisk/modules/app_dial.so
-lib/asterisk/modules/app_directory.so
-lib/asterisk/modules/app_disa.so
-lib/asterisk/modules/app_echo.so
-lib/asterisk/modules/app_enumlookup.so
-lib/asterisk/modules/app_festival.so
-lib/asterisk/modules/app_getcpeid.so
-lib/asterisk/modules/app_hasnewvoicemail.so
-lib/asterisk/modules/app_image.so
-lib/asterisk/modules/app_intercom.so
-lib/asterisk/modules/app_lookupblacklist.so
-lib/asterisk/modules/app_lookupcidname.so
-lib/asterisk/modules/app_macro.so
-lib/asterisk/modules/app_milliwatt.so
-lib/asterisk/modules/app_mp3.so
-lib/asterisk/modules/app_parkandannounce.so
-lib/asterisk/modules/app_playback.so
-lib/asterisk/modules/app_privacy.so
-lib/asterisk/modules/app_qcall.so
-lib/asterisk/modules/app_queue.so
-lib/asterisk/modules/app_random.so
-lib/asterisk/modules/app_read.so
-lib/asterisk/modules/app_record.so
-lib/asterisk/modules/app_sayunixtime.so
-lib/asterisk/modules/app_senddtmf.so
-lib/asterisk/modules/app_setcallerid.so
-lib/asterisk/modules/app_setcdruserfield.so
-lib/asterisk/modules/app_setcidname.so
-lib/asterisk/modules/app_setcidnum.so
-lib/asterisk/modules/app_softhangup.so
-lib/asterisk/modules/app_striplsd.so
-lib/asterisk/modules/app_substring.so
-lib/asterisk/modules/app_system.so
-lib/asterisk/modules/app_transfer.so
-lib/asterisk/modules/app_url.so
-lib/asterisk/modules/app_voicemail.so
-lib/asterisk/modules/app_waitforring.so
-lib/asterisk/modules/app_zapateller.so
-lib/asterisk/modules/cdr_csv.so
-lib/asterisk/modules/chan_agent.so
-lib/asterisk/modules/chan_h323.so
-lib/asterisk/modules/chan_iax.so
-lib/asterisk/modules/chan_iax2.so
-lib/asterisk/modules/chan_local.so
-lib/asterisk/modules/chan_mgcp.so
-lib/asterisk/modules/chan_modem.so
-lib/asterisk/modules/chan_modem_aopen.so
-lib/asterisk/modules/chan_modem_bestdata.so
-lib/asterisk/modules/chan_modem_i4l.so
-lib/asterisk/modules/chan_oss.so
-lib/asterisk/modules/chan_sip.so
-lib/asterisk/modules/chan_skinny.so
-lib/asterisk/modules/codec_a_mu.so
-lib/asterisk/modules/codec_adpcm.so
-lib/asterisk/modules/codec_alaw.so
-lib/asterisk/modules/codec_g723_1_dummy.so
-lib/asterisk/modules/codec_g729_dummy.so
-lib/asterisk/modules/codec_gsm.so
-lib/asterisk/modules/codec_ilbc.so
-lib/asterisk/modules/codec_lpc10.so
-lib/asterisk/modules/codec_speex.so
-lib/asterisk/modules/codec_ulaw.so
-lib/asterisk/modules/format_g723_1.so
-lib/asterisk/modules/format_g729.so
-lib/asterisk/modules/format_gsm.so
-lib/asterisk/modules/format_h263.so
-lib/asterisk/modules/format_jpeg.so
-lib/asterisk/modules/format_pcm.so
-lib/asterisk/modules/format_pcm_alaw.so
-lib/asterisk/modules/format_vox.so
-lib/asterisk/modules/format_wav.so
-lib/asterisk/modules/format_wav_gsm.so
-lib/asterisk/modules/pbx_config.so
-lib/asterisk/modules/pbx_spool.so
-lib/asterisk/modules/pbx_wilcalu.so
-lib/asterisk/modules/res_adsi.so
-lib/asterisk/modules/res_crypto.so
-lib/asterisk/modules/res_indications.so
-lib/asterisk/modules/res_monitor.so
-lib/asterisk/modules/res_musiconhold.so
-lib/asterisk/modules/res_parking.so
-sbin/asterisk
-sbin/astgenkey
-sbin/safe_asterisk
-share/asterisk/agi-bin/agi-test.agi
-share/asterisk/agi-bin/eagi-sphinx-test
-share/asterisk/agi-bin/eagi-test
-share/asterisk/images/asterisk-intro.jpg
-share/asterisk/keys/iaxtel.pub
-share/asterisk/mohmp3/sample-hold.mp3
-share/asterisk/sounds/agent-alreadyon.gsm
-share/asterisk/sounds/agent-incorrect.gsm
-share/asterisk/sounds/agent-loggedoff.gsm
-share/asterisk/sounds/agent-loginok.gsm
-share/asterisk/sounds/agent-newlocation.gsm
-share/asterisk/sounds/agent-pass.gsm
-share/asterisk/sounds/agent-user.gsm
-share/asterisk/sounds/auth-incorrect.gsm
-share/asterisk/sounds/auth-thankyou.gsm
-share/asterisk/sounds/beep.gsm
-share/asterisk/sounds/conf-getchannel.gsm
-share/asterisk/sounds/conf-getconfno.gsm
-share/asterisk/sounds/conf-getpin.gsm
-share/asterisk/sounds/conf-invalid.gsm
-share/asterisk/sounds/conf-invalidpin.gsm
-share/asterisk/sounds/conf-onlyperson.gsm
-share/asterisk/sounds/demo-abouttotry.gsm
-share/asterisk/sounds/demo-congrats.gsm
-share/asterisk/sounds/demo-echodone.gsm
-share/asterisk/sounds/demo-echotest.gsm
-share/asterisk/sounds/demo-enterkeywords.gsm
-share/asterisk/sounds/demo-instruct.gsm
-share/asterisk/sounds/demo-moreinfo.gsm
-share/asterisk/sounds/demo-nogo.gsm
-share/asterisk/sounds/demo-nomatch.gsm
-share/asterisk/sounds/demo-thanks.gsm
-share/asterisk/sounds/digits/0.gsm
-share/asterisk/sounds/digits/1.gsm
-share/asterisk/sounds/digits/10.gsm
-share/asterisk/sounds/digits/11.gsm
-share/asterisk/sounds/digits/12.gsm
-share/asterisk/sounds/digits/13.gsm
-share/asterisk/sounds/digits/14.gsm
-share/asterisk/sounds/digits/15.gsm
-share/asterisk/sounds/digits/16.gsm
-share/asterisk/sounds/digits/17.gsm
-share/asterisk/sounds/digits/18.gsm
-share/asterisk/sounds/digits/19.gsm
-share/asterisk/sounds/digits/2.gsm
-share/asterisk/sounds/digits/20.gsm
-share/asterisk/sounds/digits/3.gsm
-share/asterisk/sounds/digits/30.gsm
-share/asterisk/sounds/digits/4.gsm
-share/asterisk/sounds/digits/40.gsm
-share/asterisk/sounds/digits/5.gsm
-share/asterisk/sounds/digits/50.gsm
-share/asterisk/sounds/digits/6.gsm
-share/asterisk/sounds/digits/60.gsm
-share/asterisk/sounds/digits/7.gsm
-share/asterisk/sounds/digits/70.gsm
-share/asterisk/sounds/digits/8.gsm
-share/asterisk/sounds/digits/80.gsm
-share/asterisk/sounds/digits/9.gsm
-share/asterisk/sounds/digits/90.gsm
-share/asterisk/sounds/digits/a-m.gsm
-share/asterisk/sounds/digits/at.gsm
-share/asterisk/sounds/digits/day-0.gsm
-share/asterisk/sounds/digits/day-1.gsm
-share/asterisk/sounds/digits/day-2.gsm
-share/asterisk/sounds/digits/day-3.gsm
-share/asterisk/sounds/digits/day-4.gsm
-share/asterisk/sounds/digits/day-5.gsm
-share/asterisk/sounds/digits/day-6.gsm
-share/asterisk/sounds/digits/dollars.gsm
-share/asterisk/sounds/digits/h-1.gsm
-share/asterisk/sounds/digits/h-10.gsm
-share/asterisk/sounds/digits/h-11.gsm
-share/asterisk/sounds/digits/h-12.gsm
-share/asterisk/sounds/digits/h-13.gsm
-share/asterisk/sounds/digits/h-14.gsm
-share/asterisk/sounds/digits/h-15.gsm
-share/asterisk/sounds/digits/h-16.gsm
-share/asterisk/sounds/digits/h-17.gsm
-share/asterisk/sounds/digits/h-18.gsm
-share/asterisk/sounds/digits/h-19.gsm
-share/asterisk/sounds/digits/h-2.gsm
-share/asterisk/sounds/digits/h-20.gsm
-share/asterisk/sounds/digits/h-3.gsm
-share/asterisk/sounds/digits/h-30.gsm
-share/asterisk/sounds/digits/h-4.gsm
-share/asterisk/sounds/digits/h-5.gsm
-share/asterisk/sounds/digits/h-6.gsm
-share/asterisk/sounds/digits/h-7.gsm
-share/asterisk/sounds/digits/h-8.gsm
-share/asterisk/sounds/digits/h-9.gsm
-share/asterisk/sounds/digits/hundred.gsm
-share/asterisk/sounds/digits/million.gsm
-share/asterisk/sounds/digits/mon-0.gsm
-share/asterisk/sounds/digits/mon-1.gsm
-share/asterisk/sounds/digits/mon-10.gsm
-share/asterisk/sounds/digits/mon-11.gsm
-share/asterisk/sounds/digits/mon-2.gsm
-share/asterisk/sounds/digits/mon-3.gsm
-share/asterisk/sounds/digits/mon-4.gsm
-share/asterisk/sounds/digits/mon-5.gsm
-share/asterisk/sounds/digits/mon-6.gsm
-share/asterisk/sounds/digits/mon-7.gsm
-share/asterisk/sounds/digits/mon-8.gsm
-share/asterisk/sounds/digits/mon-9.gsm
-share/asterisk/sounds/digits/oclock.gsm
-share/asterisk/sounds/digits/oh.gsm
-share/asterisk/sounds/digits/p-m.gsm
-share/asterisk/sounds/digits/pound.gsm
-share/asterisk/sounds/digits/star.gsm
-share/asterisk/sounds/digits/thousand.gsm
-share/asterisk/sounds/digits/today.gsm
-share/asterisk/sounds/digits/tomorrow.gsm
-share/asterisk/sounds/digits/yesterday.gsm
-share/asterisk/sounds/dir-instr.gsm
-share/asterisk/sounds/dir-intro.gsm
-share/asterisk/sounds/dir-nomatch.gsm
-share/asterisk/sounds/dir-nomore.gsm
-share/asterisk/sounds/invalid.gsm
-share/asterisk/sounds/pbx-invalid.gsm
-share/asterisk/sounds/pbx-invalidpark.gsm
-share/asterisk/sounds/pbx-transfer.gsm
-share/asterisk/sounds/privacy-incorrect.gsm
-share/asterisk/sounds/privacy-prompt.gsm
-share/asterisk/sounds/privacy-thankyou.gsm
-share/asterisk/sounds/privacy-unident.gsm
-share/asterisk/sounds/ss-noservice.gsm
-share/asterisk/sounds/transfer.gsm
-share/asterisk/sounds/tt-allbusy.gsm
-share/asterisk/sounds/tt-monkeys.gsm
-share/asterisk/sounds/tt-monkeysintro.gsm
-share/asterisk/sounds/tt-somethingwrong.gsm
-share/asterisk/sounds/tt-weasels.gsm
-share/asterisk/sounds/vm
-share/asterisk/sounds/vm-Family.gsm
-share/asterisk/sounds/vm-Friends.gsm
-share/asterisk/sounds/vm-INBOX.gsm
-share/asterisk/sounds/vm-Old.gsm
-share/asterisk/sounds/vm-Work.gsm
-share/asterisk/sounds/vm-and.gsm
-share/asterisk/sounds/vm-changeto.gsm
-share/asterisk/sounds/vm-delete.gsm
-share/asterisk/sounds/vm-deleted.gsm
-share/asterisk/sounds/vm-extension.gsm
-share/asterisk/sounds/vm-first.gsm
-share/asterisk/sounds/vm-for.gsm
-share/asterisk/sounds/vm-forwardoptions.gsm
-share/asterisk/sounds/vm-goodbye.gsm
-share/asterisk/sounds/vm-helpexit.gsm
-share/asterisk/sounds/vm-incorrect.gsm
-share/asterisk/sounds/vm-instructions.gsm
-share/asterisk/sounds/vm-intro.gsm
-share/asterisk/sounds/vm-isonphone.gsm
-share/asterisk/sounds/vm-isunavail.gsm
-share/asterisk/sounds/vm-last.gsm
-share/asterisk/sounds/vm-login.gsm
-share/asterisk/sounds/vm-mailboxfull.gsm
-share/asterisk/sounds/vm-message.gsm
-share/asterisk/sounds/vm-messages.gsm
-share/asterisk/sounds/vm-mismatch.gsm
-share/asterisk/sounds/vm-msginstruct.gsm
-share/asterisk/sounds/vm-msgsaved.gsm
-share/asterisk/sounds/vm-newpassword.gsm
-share/asterisk/sounds/vm-next.gsm
-share/asterisk/sounds/vm-no.gsm
-share/asterisk/sounds/vm-nobodyavail.gsm
-share/asterisk/sounds/vm-nomore.gsm
-share/asterisk/sounds/vm-onefor.gsm
-share/asterisk/sounds/vm-options.gsm
-share/asterisk/sounds/vm-opts.gsm
-share/asterisk/sounds/vm-passchanged.gsm
-share/asterisk/sounds/vm-password.gsm
-share/asterisk/sounds/vm-press.gsm
-share/asterisk/sounds/vm-prev.gsm
-share/asterisk/sounds/vm-rec-busy.gsm
-share/asterisk/sounds/vm-rec-name.gsm
-share/asterisk/sounds/vm-rec-unv.gsm
-share/asterisk/sounds/vm-received.gsm
-share/asterisk/sounds/vm-reenterpassword.gsm
-share/asterisk/sounds/vm-repeat.gsm
-share/asterisk/sounds/vm-saved.gsm
-share/asterisk/sounds/vm-savedto.gsm
-share/asterisk/sounds/vm-savefolder.gsm
-share/asterisk/sounds/vm-savemessage.gsm
-share/asterisk/sounds/vm-sorry.gsm
-share/asterisk/sounds/vm-theperson.gsm
-share/asterisk/sounds/vm-tocancel.gsm
-share/asterisk/sounds/vm-toforward.gsm
-share/asterisk/sounds/vm-undelete.gsm
-share/asterisk/sounds/vm-undeleted.gsm
-share/asterisk/sounds/vm-whichbox.gsm
-share/asterisk/sounds/vm-youhave.gsm
-share/asterisk/sounds/voicemail
-@dirrm share/asterisk/sounds/digits
-@dirrm share/asterisk/sounds
-@dirrm share/asterisk/mohmp3
-@dirrm share/asterisk/keys
-@dirrm share/asterisk/images
-@dirrm share/asterisk/agi-bin
-@dirrm share/asterisk
-@dirrm lib/asterisk/modules
-@dirrm lib/asterisk
-@dirrm include/asterisk
-@dirrm etc/asterisk
-@cwd /var
-spool/asterisk/vm
-spool/asterisk/voicemail/default/1234/busy.gsm
-spool/asterisk/voicemail/default/1234/unavail.gsm
-@exec mkdir -p %D/log/asterisk/cdr-csv
-@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX
-@dirrm spool/asterisk/voicemail/default/1234/INBOX
-@dirrm spool/asterisk/voicemail/default/1234
-@dirrm spool/asterisk/voicemail/default
-@dirrm spool/asterisk/voicemail
-@dirrm spool/asterisk
-@dirrm log/asterisk/cdr-csv
-@dirrm log/asterisk
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
deleted file mode 100644
index 82db2899e80a..000000000000
--- a/net/asterisk14/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for:	asterisk
-# Date created:				17 October 2003
-# Whom:					Maxim Sobolev <sobomax@portaone.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	asterisk
-PORTVERSION=	0.7.2
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
-		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
-
-MAINTAINER=	sobomax@FreeBSD.org
-COMMENT=	An Open Source PBX and telephony toolkit
-
-FORBIDDEN=	http://people.freebsd.org/~eik/portaudit/27c331d5-64c7-11d8-80e3-0020ed76ef5a.html
-
-ONLY_FOR_ARCHS=	i386
-
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
-		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
-LIB_DEPENDS=	speex.2:${PORTSDIR}/audio/speex
-RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
-
-GNU_CONFIGURE=	yes
-CONFIGURE_WRKSRC=	${WRKSRC}/editline
-USE_GMAKE=	yes
-USE_OPENLDAP=	yes
-MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		MKDIR="${MKDIR}" \
-		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \
-		OSVERSION=${OSVERSION} \
-		CXX="${CXX}"
-
-.include <bsd.port.mk>
diff --git a/net/asterisk14/distinfo b/net/asterisk14/distinfo
deleted file mode 100644
index 13e376bb0fae..000000000000
--- a/net/asterisk14/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (asterisk-0.7.2.tar.gz) = a1f9485f5f85a4e4129782b6e642e236
-SIZE (asterisk-0.7.2.tar.gz) = 2779788
diff --git a/net/asterisk14/files/patch-Makefile b/net/asterisk14/files/patch-Makefile
deleted file mode 100644
index 1e4ffbe62070..000000000000
--- a/net/asterisk14/files/patch-Makefile
+++ /dev/null
@@ -1,301 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig	Wed Jan 14 08:48:38 2004
-+++ Makefile	Fri Jan 30 02:25:09 2004
-@@ -43,10 +43,10 @@
- #K6OPT  = -DK6OPT
- 
- #Tell gcc to optimize the asterisk's code
--OPTIMIZE=-O6
-+#OPTIMIZE=-O6
- 
- #Include debug symbols in the executables (-g) and profiling info (-pg)
--DEBUG=-g #-pg
-+#DEBUG=-g #-pg
- 
- # New hangup routines for chan_zap.c
- # If this flag is uncommented then you need to have new libpri code in your system
-@@ -68,7 +68,7 @@
- 
- # Where to install asterisk after compiling
- # Default -> leave empty
--INSTALL_PREFIX=
-+INSTALL_PREFIX=$(PREFIX)
- 
- # Staging directory
- # Files are copied here temporarily during the install process
-@@ -88,28 +88,26 @@
- # Don't use together with -DBUSYDETECT_TONEONLY
- BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
- 
--ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
--ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
-+ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk
-+ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk
- ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
--ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
--ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
--ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
-+ASTSPOOLDIR=/var/spool/asterisk
-+ASTLOGDIR=/var/log/asterisk
-+ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk
- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
--ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
--ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
--ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
-+ASTBINDIR=$(INSTALL_PREFIX)/bin
-+ASTSBINDIR=$(INSTALL_PREFIX)/sbin
-+ASTVARRUNDIR=/var/run
- 
- MODULES_DIR=$(ASTLIBDIR)/modules
- AGI_DIR=$(ASTVARLIBDIR)/agi-bin
- 
- INCLUDE=-Iinclude -I../include
--CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
- CFLAGS+=$(OPTIMIZE)
--CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- ifeq (${OSARCH},FreeBSD)
--CFLAGS+=-pthread
--INCLUDE+=-I/usr/local/include
-+CFLAGS+=$(PTHREAD_CFLAGS)
- endif
- ifeq (${OSARCH},OpenBSD)
- CFLAGS+=-pthread
-@@ -151,7 +149,7 @@
- LIBS=-pthread
- else
- ifeq (${OSARCH},FreeBSD)
--LIBS=-pthread
-+LIBS=$(PTHREAD_LIBS)
- else
- endif
- endif
-@@ -179,7 +177,7 @@
- SOLINK=-shared -Xlinker -x
- endif
- 
--CC=gcc
-+CC?=gcc
- INSTALL=install
- 
- _all: all
-@@ -200,13 +198,13 @@
- 	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
- 	$(MAKE) -C editline libedit.a
- 
--db1-ast/libdb1.a: FORCE
--	@if [ -d db1-ast ]; then \
--		$(MAKE) -C db1-ast libdb1.a ; \
--	else \
--		echo "You need to do a cvs update -d not just cvs update"; \
--		exit 1; \
--	fi
-+#db1-ast/libdb1.a: FORCE
-+#	@if [ -d db1-ast ]; then \
-+#		$(MAKE) -C db1-ast libdb1.a ; \
-+#	else \
-+#		echo "You need to do a cvs update -d not just cvs update"; \
-+#		exit 1; \
-+#	fi
- 
- ifneq ($(wildcard .depend),)
- include .depend
-@@ -244,8 +242,8 @@
- 		exit 1; \
- 	fi
- 
--asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
--	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a
-+asterisk: editline/libedit.a stdtime/libtime.a $(OBJS)
-+	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) stdtime/libtime.a
- 
- subdirs: 
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
-@@ -260,10 +258,10 @@
- 	$(MAKE) -C stdtime clean
- 
- datafiles: all
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
- 	for x in sounds/digits/*.gsm; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
-@@ -271,18 +269,18 @@
- 	done
- 	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-*; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
- 		fi; \
- 	done
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/images
- 	for x in images/*.jpg; do \
--		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
- 	done
--	mkdir -p $(DESTDIR)$(AGI_DIR)
-+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
- 
- update: 
- 	@if [ -d CVS ]; then \
-@@ -294,105 +292,74 @@
- 	fi
- 
- bininstall: all
--	mkdir -p $(DESTDIR)$(MODULES_DIR)
--	mkdir -p $(DESTDIR)$(ASTSBINDIR)
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	mkdir -p $(DESTDIR)$(ASTBINDIR)
--	mkdir -p $(DESTDIR)$(ASTSBINDIR)
--	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
--	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
--	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
-+	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
-+	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
- 	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
--		install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
-+		$(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
- 	fi
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
--	install -d $(DESTDIR)$(ASTHEADERDIR)
--	install -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
-+	$(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
- 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm
--	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail
--	if [ ! -h $(DESTDIR)$(ASTSPOOLDIR)/vm ] && [ -d $(DESTDIR)$(ASTSPOOLDIR)/vm ]; then \
--		mv $(DESTDIR)$(ASTSPOOLDIR)/vm $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \
--	else \
--		mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \
--		rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \
--	fi
--	ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_ixj.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_tor.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_mysql.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_unixodbc.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/codec_mp3_d.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/format_mp3.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/app_voicemail2.so
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
--	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
--	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
--	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/vm . )
--	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
--	@echo " +---- Asterisk Installation Complete -------+"  
--	@echo " +                                           +"
--	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
--	@echo " +                                           +"
--	@echo " + Asterisk has successfully been installed. +"  
--	@echo " + If you would like to install the sample   +"  
--	@echo " + configuration files (overwriting any      +"
--	@echo " + existing config files), run:              +"  
--	@echo " +                                           +"
--	@echo " +               $(MAKE) samples                +"
--	@echo " +                                           +"
--	@echo " +-----------------  or ---------------------+"
--	@echo " +                                           +"
--	@echo " + You can go ahead and install the asterisk +"
--	@echo " + program documentation now or later run:   +"
--	@echo " +                                           +"
--	@echo " +              $(MAKE) progdocs                +"
--	@echo " +                                           +"
--	@echo " + **Note** This requires that you have      +"
--	@echo " + doxygen installed on your local system    +"
--	@echo " +-------------------------------------------+"
-+	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/vm . )
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/voicemail . )
- 
--install: all datafiles bininstall
-+install: all datafiles bininstall samples
- 
- upgrade: all bininstall
- 
- adsi: all
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
- 	for x in configs/*.adsi; do \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x`-dist; \
- 		if ! [ -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \
--			install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
- 		fi ; \
- 	done
- 
- samples: all datafiles adsi
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	for x in configs/*.sample; do \
--		if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
--			mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	for x in configs/*.sample channels/h323/*.sample; do \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\
-+		if ! [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
- 		fi ; \
--		install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
- 	done
--	echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
-+	echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	if ! [ -f $(DESTDIR)$(ASTETCDIR)/asterisk.conf ]; then \
-+		$(BSD_INSTALL_DATA) $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist $(DESTDIR)$(ASTETCDIR)/asterisk.conf; \
-+	fi
- 	for x in sounds/demo-*; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
- 		fi; \
- 	done
- 	for x in sounds/*.mp3; do \
--		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
- 	done
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
- 	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
- 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
- 		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
diff --git a/net/asterisk14/files/patch-agi::Makefile b/net/asterisk14/files/patch-agi::Makefile
deleted file mode 100644
index 567c30f5624e..000000000000
--- a/net/asterisk14/files/patch-agi::Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-
-$FreeBSD$
-
---- agi/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ agi/Makefile	Fri Jan 30 02:31:07 2004
-@@ -11,21 +11,24 @@
- # the GNU General Public License
- #
- 
--AGIS=agi-test.agi eagi-test eagi-sphinx-test
-+AGIS_BIN=eagi-test eagi-sphinx-test
-+AGIS_SCR=agi-test.agi
-+AGIS=$(AGIS_SCR) $(AGIS_BIN)
- 
- CFLAGS+=
- 
- all: depend $(AGIS)
- 
- install: all
--	mkdir -p $(DESTDIR)$(AGI_DIR)
--	for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
-+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
-+	for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done
-+	for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
- 
- eagi-test: eagi-test.o
--	$(CC) -o eagi-test eagi-test.o
-+	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
- 	
- eagi-sphinx-test: eagi-sphinx-test.o
--	$(CC) -o eagi-sphinx-test eagi-sphinx-test.o
-+	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o
- 
- clean:
- 	rm -f *.so *.o look .depend
diff --git a/net/asterisk14/files/patch-apps::Makefile b/net/asterisk14/files/patch-apps::Makefile
deleted file mode 100644
index 901ba694c33a..000000000000
--- a/net/asterisk14/files/patch-apps::Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- apps/Makefile.orig	Mon Jan 12 03:56:38 2004
-+++ apps/Makefile	Fri Jan 30 01:47:34 2004
-@@ -59,17 +59,17 @@
- 	$(CC) $(SOLINK) -o $@ $< -ltonezone
- 
- install: all
--	for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- app_todd.o: app_todd.c
--	gcc -pipe -O6 -g  -Iinclude -I../include -D_REENTRANT -march=i586 -DDO_CRASH -c -o  app_todd.o app_todd.c
-+	$(CC) $(CFLAGS) -Iinclude -I../include -D_REENTRANT -DDO_CRASH -c -o  app_todd.o app_todd.c
- 
- app_todd.so: app_todd.o
--	$(CC) $(SOLINK) -o $@ $< -L/usr/local/ssl/lib -lssl -lcrypto
-+	$(CC) $(SOLINK) -o $@ $< -lssl -lcrypto
- 
- app_voicemail.so : app_voicemail.o
- ifeq ($(USE_MYSQL_VM_INTERFACE),1)
--	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient -lz
-+	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L$(LOCALBASE)/lib/mysql -lmysqlclient -lz
- else
- ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
- 	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq
-@@ -88,7 +88,7 @@
- 	$(CC) $(SOLINK) -o $@ $< -lodbc
- 
- look:	look.c
--	gcc -pipe -O6 -g look.c -o look -lncurses
-+	$(CC) $(CFLAGS) look.c -o look -lncurses
- 
- ifneq ($(wildcard .depend),)
- include .depend
diff --git a/net/asterisk14/files/patch-apps::app_intercom.c b/net/asterisk14/files/patch-apps::app_intercom.c
deleted file mode 100644
index e4ac57f8e31b..000000000000
--- a/net/asterisk14/files/patch-apps::app_intercom.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- apps/app_intercom.c.orig	Wed Oct 22 06:10:24 2003
-+++ apps/app_intercom.c	Fri Jan 30 01:52:03 2004
-@@ -29,7 +29,7 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk14/files/patch-astman::Makefile b/net/asterisk14/files/patch-astman::Makefile
deleted file mode 100644
index cf31005257cf..000000000000
--- a/net/asterisk14/files/patch-astman::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- astman/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ astman/Makefile	Fri Jan 30 01:47:34 2004
-@@ -8,7 +8,7 @@
- install:
- 	if [ "$(TARGET)" != "none" ]; then \
- 		for x in $(TARGET); do \
--			install -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/astman; \
-+			$(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/astman; \
- 		done ; \
- 	fi
- 
diff --git a/net/asterisk14/files/patch-cdr::Makefile b/net/asterisk14/files/patch-cdr::Makefile
deleted file mode 100644
index 2ede608f9019..000000000000
--- a/net/asterisk14/files/patch-cdr::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- cdr/Makefile.orig	Sun Jan 11 21:17:02 2004
-+++ cdr/Makefile	Fri Jan 30 01:47:34 2004
-@@ -43,7 +43,7 @@
- all: depend $(MODS)
- 
- install: all
--	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- clean:
- 	rm -f *.so *.o .depend
diff --git a/net/asterisk14/files/patch-channels::Makefile b/net/asterisk14/files/patch-channels::Makefile
deleted file mode 100644
index d05ee2c13676..000000000000
--- a/net/asterisk14/files/patch-channels::Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-
-$FreeBSD$
-
---- channels/Makefile.orig	Fri Jan 23 22:57:48 2004
-+++ channels/Makefile	Thu Feb 19 01:48:41 2004
-@@ -26,12 +26,10 @@
- #
- #CHANNEL_LIBS+=chan_vofr
- 
--ifneq (${OSARCH},Darwin)
- CHANNEL_LIBS+=chan_oss.so
--endif
- 
- CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
--CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
-+CHANNEL_LIBS+=chan_h323.so
- 
- CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
- CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
-@@ -99,10 +97,8 @@
- 
- chan_oss.o: chan_oss.c  busy.h ringtone.h
- 
--ifeq (${OSARCH},OpenBSD)
- chan_oss.so: chan_oss.o
--	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
--endif
-+	$(CC) $(SOLINK) -o $@ chan_oss.o
- 
- chan_iax2.so: chan_iax2.o iax2-parser.o
- ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -146,15 +142,17 @@
- chan_vpb.so: chan_vpb.o
- 	 $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl
- 
--chan_h323.so: chan_h323.o h323/libchanh323.a
--	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+chan_h323.so: chan_h323.o h323/ast_h323.o
-+	$(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
- 
-+h323/ast_h323.o:
-+	$(MAKE) -C h323 ast_h323.o
- 
- #chan_modem.so : chan_modem.o
- #	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<
- 
- install: all
--	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk14/files/patch-channels::chan_h323.c b/net/asterisk14/files/patch-channels::chan_h323.c
deleted file mode 100644
index e413bd8ecec8..000000000000
--- a/net/asterisk14/files/patch-channels::chan_h323.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_h323.c.orig	Tue Jan 13 11:24:26 2004
-+++ channels/chan_h323.c	Fri Jan 30 01:47:34 2004
-@@ -54,6 +54,7 @@
- #include <fcntl.h>
- #include <netdb.h>
- #include <sys/signal.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- 
- 
diff --git a/net/asterisk14/files/patch-channels::chan_oss.c b/net/asterisk14/files/patch-channels::chan_oss.c
deleted file mode 100644
index 1006b377874e..000000000000
--- a/net/asterisk14/files/patch-channels::chan_oss.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_oss.c.orig	Wed Oct 22 06:10:34 2003
-+++ channels/chan_oss.c	Fri Jan 30 01:50:35 2004
-@@ -36,7 +36,7 @@
- #ifdef __linux
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk14/files/patch-channels::h323::Makefile b/net/asterisk14/files/patch-channels::h323::Makefile
deleted file mode 100644
index a9159b4441c1..000000000000
--- a/net/asterisk14/files/patch-channels::h323::Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-
-$FreeBSD$
-
---- channels/h323/Makefile.orig	Sun Jan 11 04:22:32 2004
-+++ channels/h323/Makefile	Fri Jan 30 01:47:34 2004
-@@ -19,7 +19,7 @@
- #
- # This needs to be updated to deal with more than just little endian machines
- #
--CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
-+CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
- 
- 
- #############################################
-@@ -27,38 +27,39 @@
- # Only change below if you know WTF your doing
- #
- CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
--CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
--CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
-+CFLAGS += -Wall -fPIC
-+CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
- CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
- CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
- CFLAGS += -I../../include
- CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
--CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
-+CFLAGS += -I$(OPENH323DIR)/include
- 
- 
- all:   	libchanh323.a
- 
- samples: 
--	if [ -f $(ASTETCDIR)/h323.conf ]; then \
--		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
-+	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
-+	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
-+		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
- 	fi ; 
--	install h323.conf.sample $(ASTETCDIR)/h323.conf
-  
- 
- ast_h323.o:	ast_h323.cpp
--	g++ -g -c -o $@ $(CFLAGS) $<
-+	$(CXX) -c -o $@ $(CFLAGS) $<
- 
- libchanh323.a:	ast_h323.o
- 	ar cr libchanh323.a ast_h323.o
- 
- chan_h323.so:	
--	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
- 
- chan_h323_d.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
- 
- chan_h323_s.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
-+
- clean:
- 	rm -f *.o *.so core.* libchanh323.a
- 
diff --git a/net/asterisk14/files/patch-codecs::Makefile b/net/asterisk14/files/patch-codecs::Makefile
deleted file mode 100644
index b802dc1233e8..000000000000
--- a/net/asterisk14/files/patch-codecs::Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-
-$FreeBSD$
-
---- codecs/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ codecs/Makefile	Fri Jan 30 01:47:34 2004
-@@ -17,23 +17,22 @@
- # g723.1b)
- #
- #MODG723=codec_g723_1.so codec_g723_1b.so
--MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
--MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
--MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
-+MODG723=codec_g723_1_dummy.so
-+MODG729=codec_g729_dummy.so
-+MODSPEEX=codec_speex.so
- MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
--CFLAGS+=-fPIC
--CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
-+CFLAGS+=-fPIC -I$(LOCALBASE)/include
- 
- LIBG723=g723.1/libg723.a
- LIBG723B=g723.1b/libg723b.a
- LIBGSM=gsm/lib/libgsm.a
- LIBGSMT=gsm/lib/libgsm.a
- LIBLPC10=lpc10/liblpc10.a
--LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib")
-+LIBSPEEX=-L$(LOCALBASE)/lib
- LIBSPEEX+=-lspeex -lm
- LIBILBC=ilbc/libilbc.a
- 
--CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-+CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so
- 
- all: depend $(CODECS)
-@@ -88,7 +87,7 @@
- include .depend
- 
- install: all
--	for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(CODECS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk14/files/patch-codecs::codec_g723_1_dummy.c b/net/asterisk14/files/patch-codecs::codec_g723_1_dummy.c
deleted file mode 100644
index 661ff2d88602..000000000000
--- a/net/asterisk14/files/patch-codecs::codec_g723_1_dummy.c
+++ /dev/null
@@ -1,314 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g723_1_dummy.c	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,308 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Translate between signed linear and G.723.1 (dummy!)
-+ *
-+ * The G.723.1 code is not included in the Asterisk distribution because
-+ * it is covered with patents, and in spite of statements to the contrary,
-+ * the "technology" is extremely expensive to license.
-+ * 
-+ * Copyright (C) 1999, Mark Spencer
-+ *
-+ * Mark Spencer <markster@linux-support.net>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#define TYPE_HIGH	 0x0
-+#define TYPE_LOW	 0x1
-+#define TYPE_SILENCE	 0x2
-+#define TYPE_DONTSEND	 0x3
-+#define TYPE_MASK	 0x3
-+
-+#include <sys/types.h>
-+#include <asterisk/translate.h>
-+#include <asterisk/module.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/channel.h>
-+#include <pthread.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <netinet/in.h>
-+#include <string.h>
-+#include <stdio.h>
-+
-+/* Sample frame data */
-+#include "slin_g723_ex.h"
-+#include "g723_slin_ex.h"
-+
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
-+static int localusecnt=0;
-+
-+static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator";
-+
-+struct g723_encoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Buffer for our outgoing frame */
-+	char outbuf[8000];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+struct g723_decoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+static struct ast_translator_pvt *g723tolin_new()
-+{
-+	struct g723_decoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g723_decoder_pvt));
-+	if (tmp) {
-+		tmp->tail = 0;
-+		localusecnt++;
-+		ast_update_use_count();
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *lintog723_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_SLINEAR;
-+	f.datalen = sizeof(slin_g723_ex);
-+	/* Assume 8000 Hz */
-+	f.samples = sizeof(slin_g723_ex)/16;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = slin_g723_ex;
-+	return &f;
-+}
-+
-+static struct ast_frame *g723tolin_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_G723_1;
-+	f.datalen = sizeof(g723_slin_ex);
-+	/* All frames are 30 ms long */
-+	f.samples = 30;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = g723_slin_ex;
-+	return &f;
-+}
-+
-+static struct ast_translator_pvt *lintog723_new()
-+{
-+	struct g723_encoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g723_encoder_pvt));
-+	if (tmp) {
-+		localusecnt++;
-+		ast_update_use_count();
-+		tmp->tail = 0;
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *g723tolin_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt;
-+	if (!tmp->tail)
-+		return NULL;
-+	/* Signed linear is no particular frame size, so just send whatever
-+	   we have in the buffer in one lump sum */
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_SLINEAR;
-+	tmp->f.datalen = tmp->tail * 2;
-+	/* Assume 8000 Hz */
-+	tmp->f.samples = tmp->tail / 8;
-+	tmp->f.mallocd = 0;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.data = tmp->buf;
-+	/* Reset tail pointer */
-+	tmp->tail = 0;
-+
-+	return &tmp->f;	
-+}
-+
-+static int g723_len(unsigned char buf)
-+{
-+	switch(buf & TYPE_MASK) {
-+	case TYPE_DONTSEND:
-+		return 2;
-+		break;
-+	case TYPE_SILENCE:
-+		return 4;
-+		break;
-+	case TYPE_HIGH:
-+		return 24;
-+		break;
-+	case TYPE_LOW:
-+		return 20;
-+		break;
-+	default:
-+		ast_log(LOG_WARNING, "Badly encoded frame (%d)\n", buf & TYPE_MASK);
-+	}
-+	return -1;
-+}
-+
-+static int g723tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt;
-+	int len = 0;
-+	int res;
-+	while(len < f->datalen) {
-+		/* Assuming there's space left, decode into the current buffer at
-+		   the tail location */
-+		res = g723_len(((unsigned char *)f->data + len)[0]);
-+		if (res < 0) {
-+			ast_log(LOG_WARNING, "Invalid data\n");
-+			return -1;
-+		}
-+		if (res + len > f->datalen) {
-+			ast_log(LOG_WARNING, "Measured length exceeds frame length\n");
-+			return -1;
-+		}
-+		if (tmp->tail + 480 < sizeof(tmp->buf)/2) {	
-+			memset(tmp->buf + tmp->tail, 0, 480);
-+			tmp->tail+=480;
-+		} else {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return -1;
-+		}
-+		len += res;
-+	}
-+	return 0;
-+}
-+
-+static int lintog723_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	/* Just add the frames to our stream */
-+	/* XXX We should look at how old the rest of our stream is, and if it
-+	   is too old, then we should overwrite it entirely, otherwise we can
-+	   get artifacts of earlier talk that do not belong */
-+	struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt;
-+	if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) {
-+		memcpy(&tmp->buf[tmp->tail], f->data, f->datalen);
-+		tmp->tail += f->datalen/2;
-+	} else {
-+		ast_log(LOG_WARNING, "Out of buffer space\n");
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static struct ast_frame *lintog723_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt;
-+	int cnt=0;
-+	/* We can't work on anything less than a frame in size */
-+	if (tmp->tail < 480)
-+		return NULL;
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_G723_1;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.samples = 0;
-+	tmp->f.mallocd = 0;
-+	while(tmp->tail >= 480) {
-+		/* Encode a frame of data */
-+		if (cnt + 24 >= sizeof(tmp->outbuf)) {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return NULL;
-+		}
-+		memset(tmp->outbuf + cnt, 0, 24);
-+		/* Assume 8000 Hz */
-+		tmp->f.samples += 30;
-+		cnt += 24;
-+		tmp->tail -= 480;
-+		/* Move the data at the end of the buffer to the front */
-+		if (tmp->tail)
-+			memmove(tmp->buf, tmp->buf + 480, tmp->tail * 2);
-+	}
-+	tmp->f.datalen = cnt;
-+	tmp->f.data = tmp->outbuf;
-+	return &tmp->f;	
-+}
-+
-+static void g723_destroy(struct ast_translator_pvt *pvt)
-+{
-+	free(pvt);
-+	localusecnt--;
-+	ast_update_use_count();
-+}
-+
-+static struct ast_translator g723tolin =
-+	{ "g723tolin_dummy", 
-+	   AST_FORMAT_G723_1, AST_FORMAT_SLINEAR,
-+	   g723tolin_new,
-+	   g723tolin_framein,
-+	   g723tolin_frameout,
-+	   g723_destroy,
-+	   g723tolin_sample
-+	   };
-+
-+static struct ast_translator lintog723 =
-+	{ "lintog723_dummy", 
-+	   AST_FORMAT_SLINEAR, AST_FORMAT_G723_1,
-+	   lintog723_new,
-+	   lintog723_framein,
-+	   lintog723_frameout,
-+	   g723_destroy,
-+	   lintog723_sample
-+	   };
-+
-+int unload_module(void)
-+{
-+	int res;
-+	ast_mutex_lock(&localuser_lock);
-+	res = ast_unregister_translator(&lintog723);
-+	if (!res)
-+		res = ast_unregister_translator(&g723tolin);
-+	if (localusecnt)
-+		res = -1;
-+	ast_mutex_unlock(&localuser_lock);
-+	return res;
-+}
-+
-+int load_module(void)
-+{
-+	int res;
-+	res=ast_register_translator(&g723tolin);
-+	if (!res) 
-+		res=ast_register_translator(&lintog723);
-+	else
-+		ast_unregister_translator(&g723tolin);
-+	return res;
-+}
-+
-+char *description(void)
-+{
-+	return tdesc;
-+}
-+
-+int usecount(void)
-+{
-+	int res;
-+	STANDARD_USECOUNT(res);
-+	return res;
-+}
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk14/files/patch-codecs::codec_g729_dummy.c b/net/asterisk14/files/patch-codecs::codec_g729_dummy.c
deleted file mode 100644
index c3e27d98e27e..000000000000
--- a/net/asterisk14/files/patch-codecs::codec_g729_dummy.c
+++ /dev/null
@@ -1,281 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g729_dummy.c	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,275 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Translate between signed linear and G.729 (dummy!)
-+ *
-+ * The G.729 code is not included in the Asterisk distribution because
-+ * it is covered with patents, and in spite of statements to the contrary,
-+ * the "technology" is extremely expensive to license.
-+ * 
-+ * Copyright (C) 1999, Mark Spencer
-+ *
-+ * Mark Spencer <markster@linux-support.net>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#include <sys/types.h>
-+#include <asterisk/translate.h>
-+#include <asterisk/module.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/channel.h>
-+#include <pthread.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <netinet/in.h>
-+#include <string.h>
-+#include <stdio.h>
-+
-+/* Sample frame data */
-+#include "slin_g729_ex.h"
-+#include "g729_slin_ex.h"
-+
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
-+static int localusecnt=0;
-+
-+static char *tdesc = "Dummy G.729/PCM16 Codec Translator";
-+
-+struct g729_encoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Buffer for our outgoing frame */
-+	char outbuf[8000];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+struct g729_decoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+static struct ast_translator_pvt *g729tolin_new()
-+{
-+	struct g729_decoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g729_decoder_pvt));
-+	if (tmp) {
-+		tmp->tail = 0;
-+		localusecnt++;
-+		ast_update_use_count();
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *lintog729_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_SLINEAR;
-+	f.datalen = sizeof(slin_g729_ex);
-+	/* Assume 8000 Hz */
-+	f.samples = sizeof(slin_g729_ex)/16;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = slin_g729_ex;
-+	return &f;
-+}
-+
-+static struct ast_frame *g729tolin_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_G729A;
-+	f.datalen = sizeof(g729_slin_ex);
-+	/* All frames are 10 ms long */
-+	f.samples = 10;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = g729_slin_ex;
-+	return &f;
-+}
-+
-+static struct ast_translator_pvt *lintog729_new()
-+{
-+	struct g729_encoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g729_encoder_pvt));
-+	if (tmp) {
-+		localusecnt++;
-+		ast_update_use_count();
-+		tmp->tail = 0;
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *g729tolin_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt;
-+	if (!tmp->tail)
-+		return NULL;
-+	/* Signed linear is no particular frame size, so just send whatever
-+	   we have in the buffer in one lump sum */
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_SLINEAR;
-+	tmp->f.datalen = tmp->tail * 2;
-+	/* Assume 8000 Hz */
-+	tmp->f.samples = tmp->tail / 8;
-+	tmp->f.mallocd = 0;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.data = tmp->buf;
-+	/* Reset tail pointer */
-+	tmp->tail = 0;
-+
-+	return &tmp->f;	
-+}
-+
-+static int g729tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt;
-+	int len = 0;
-+	while(len < f->datalen) {
-+		/* Assuming there's space left, decode into the current buffer at
-+		   the tail location */
-+		if (10 + len > f->datalen) {
-+			ast_log(LOG_WARNING, "Measured length exceeds frame length\n");
-+			return -1;
-+		}
-+		if (tmp->tail + 160 < sizeof(tmp->buf)/2) {	
-+			memset(tmp->buf + tmp->tail, 0, 160);
-+			tmp->tail+=160;
-+		} else {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return -1;
-+		}
-+		len += 10;
-+	}
-+	return 0;
-+}
-+
-+static int lintog729_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	/* Just add the frames to our stream */
-+	/* XXX We should look at how old the rest of our stream is, and if it
-+	   is too old, then we should overwrite it entirely, otherwise we can
-+	   get artifacts of earlier talk that do not belong */
-+	struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt;
-+	if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) {
-+		memcpy(&tmp->buf[tmp->tail], f->data, f->datalen);
-+		tmp->tail += f->datalen/2;
-+	} else {
-+		ast_log(LOG_WARNING, "Out of buffer space\n");
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static struct ast_frame *lintog729_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt;
-+	int cnt=0;
-+	/* We can't work on anything less than a frame in size */
-+	if (tmp->tail < 160)
-+		return NULL;
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_G729A;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.samples = 0;
-+	tmp->f.mallocd = 0;
-+	while(tmp->tail >= 160) {
-+		/* Encode a frame of data */
-+		if (cnt + 10 >= sizeof(tmp->outbuf)) {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return NULL;
-+		}
-+		memset(tmp->outbuf + cnt, 0, 10);
-+		/* Assume 8000 Hz */
-+		tmp->f.samples += 10;
-+		cnt += 10;
-+		tmp->tail -= 160;
-+		/* Move the data at the end of the buffer to the front */
-+		if (tmp->tail)
-+			memmove(tmp->buf, tmp->buf + 160, tmp->tail * 2);
-+	}
-+	tmp->f.datalen = cnt;
-+	tmp->f.data = tmp->outbuf;
-+	return &tmp->f;	
-+}
-+
-+static void g729_destroy(struct ast_translator_pvt *pvt)
-+{
-+	free(pvt);
-+	localusecnt--;
-+	ast_update_use_count();
-+}
-+
-+static struct ast_translator g729tolin =
-+	{ "g729tolin_dummy", 
-+	   AST_FORMAT_G729A, AST_FORMAT_SLINEAR,
-+	   g729tolin_new,
-+	   g729tolin_framein,
-+	   g729tolin_frameout,
-+	   g729_destroy,
-+	   g729tolin_sample
-+	   };
-+
-+static struct ast_translator lintog729 =
-+	{ "lintog729_dummy", 
-+	   AST_FORMAT_SLINEAR, AST_FORMAT_G729A,
-+	   lintog729_new,
-+	   lintog729_framein,
-+	   lintog729_frameout,
-+	   g729_destroy,
-+	   lintog729_sample
-+	   };
-+
-+int unload_module(void)
-+{
-+	int res;
-+	ast_mutex_lock(&localuser_lock);
-+	res = ast_unregister_translator(&lintog729);
-+	if (!res)
-+		res = ast_unregister_translator(&g729tolin);
-+	if (localusecnt)
-+		res = -1;
-+	ast_mutex_unlock(&localuser_lock);
-+	return res;
-+}
-+
-+int load_module(void)
-+{
-+	int res;
-+	res=ast_register_translator(&g729tolin);
-+	if (!res) 
-+		res=ast_register_translator(&lintog729);
-+	else
-+		ast_unregister_translator(&g729tolin);
-+	return res;
-+}
-+
-+char *description(void)
-+{
-+	return tdesc;
-+}
-+
-+int usecount(void)
-+{
-+	int res;
-+	STANDARD_USECOUNT(res);
-+	return res;
-+}
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk14/files/patch-codecs::g729_slin_ex.h b/net/asterisk14/files/patch-codecs::g729_slin_ex.h
deleted file mode 100644
index 44e60f2de848..000000000000
--- a/net/asterisk14/files/patch-codecs::g729_slin_ex.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/g729_slin_ex.h	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,14 @@
-+/*
-+ * g729_slin_ex.h --
-+ *
-+ *      8-bit G.729 data, 10 milliseconds worth at 8 kHz.
-+ *
-+ * Copyright (C) 2004, Maxim Sobolev <sobomax@FreeBSD.org>
-+ *
-+ * Distributed under the terms of the GNU General Public License
-+ *
-+ */
-+
-+static unsigned char g729_slin_ex[] = {
-+120,82,175,64,0,250,219,0,7,214
-+};
diff --git a/net/asterisk14/files/patch-codecs::gsm::Makefile b/net/asterisk14/files/patch-codecs::gsm::Makefile
deleted file mode 100644
index d60ed11f3298..000000000000
--- a/net/asterisk14/files/patch-codecs::gsm::Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- codecs/gsm/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/gsm/Makefile	Fri Jan 30 01:47:34 2004
-@@ -60,8 +60,8 @@
- # CC		= /usr/lang/acc
- # CCFLAGS 	= -c -O
- 
--CC		= gcc $(OPTIMIZE) -fomit-frame-pointer 
--CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
-+CC		?= gcc
-+CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer
- 
- LD 		= $(CC)
- 
-@@ -146,7 +146,7 @@
- DEBUG	= -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
- 
--CFLAGS	= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
-+CFLAGS	+= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
- 	$(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC)
- ######### It's $(CC) $(CFLAGS)
- 
diff --git a/net/asterisk14/files/patch-codecs::ilbc::Makefile b/net/asterisk14/files/patch-codecs::ilbc::Makefile
deleted file mode 100644
index 7770e07550a4..000000000000
--- a/net/asterisk14/files/patch-codecs::ilbc::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-
-$FreeBSD$
-
---- codecs/ilbc/Makefile.orig	Sun Apr 27 21:13:11 2003
-+++ codecs/ilbc/Makefile	Fri Jan 30 01:47:34 2004
-@@ -1,4 +1,4 @@
--CFLAGS+= -fPIC -O3
-+CFLAGS+= -fPIC
- LIB=libilbc.a
- 
- OBJS= anaFilter.o iCBSearch.o packing.o \
diff --git a/net/asterisk14/files/patch-codecs::lpc10::Makefile b/net/asterisk14/files/patch-codecs::lpc10::Makefile
deleted file mode 100644
index 68c98c064f70..000000000000
--- a/net/asterisk14/files/patch-codecs::lpc10::Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD$
-
---- codecs/lpc10/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/lpc10/Makefile	Fri Jan 30 02:06:54 2004
-@@ -3,7 +3,7 @@
- # 
- 
- # default C compiler
--CC= gcc
-+CC?= gcc
- 
- # 
- # These definitions for CFLAGS and LIB_TARGET_DIR are used when one
-@@ -22,14 +22,14 @@
- # 
- 
- WARNINGS = -Wall -Wno-comment -Wno-error
--CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
-+CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
- #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
- 
- #fix for PPC processors
- ifneq ($(OSARCH),Darwin)
- ifneq ($(PROC),ppc)
- ifneq ($(PROC),x86_64)
--	CFLAGS+= -march=$(PROC)
-+	CFLAGS+= 
- endif
- endif
- endif
diff --git a/net/asterisk14/files/patch-codecs::slin_g729_ex.h b/net/asterisk14/files/patch-codecs::slin_g729_ex.h
deleted file mode 100644
index e1236d2498dc..000000000000
--- a/net/asterisk14/files/patch-codecs::slin_g729_ex.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/slin_g729_ex.h	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,25 @@
-+/*
-+ * slin_g729_ex.h --
-+ *
-+ *	Signed 16-bit audio data, 10 milliseconds worth at 8 kHz.
-+ *
-+ * Source: g723.example
-+ *
-+ * Copyright (C) 2001, Linux Support Services, Inc.
-+ *
-+ * Distributed under the terms of the GNU General Public License
-+ *
-+ */
-+
-+static signed short slin_g729_ex[] = {
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
-+};
diff --git a/net/asterisk14/files/patch-db.c b/net/asterisk14/files/patch-db.c
deleted file mode 100644
index 59e5cef87770..000000000000
--- a/net/asterisk14/files/patch-db.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- db.c.orig	Tue Dec  2 17:12:56 2003
-+++ db.c	Fri Jan 30 01:47:34 2004
-@@ -32,7 +32,7 @@
- #include <asterisk/options.h>
- #include <asterisk/astdb.h>
- #include <asterisk/cli.h>
--#include "db1-ast/include/db.h"
-+#include <db.h>
- #include "asterisk.h"
- #include "astconf.h"
- 
diff --git a/net/asterisk14/files/patch-editline::configure b/net/asterisk14/files/patch-editline::configure
deleted file mode 100644
index f6b9c5b76eee..000000000000
--- a/net/asterisk14/files/patch-editline::configure
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- editline/configure.orig	Sun Apr 27 21:13:11 2003
-+++ editline/configure	Fri Jan 30 01:47:34 2004
-@@ -1906,7 +1906,7 @@
-   CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG"
-   CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE"
- else
--  CFLAGS="$CFLAGS -O"
-+  CFLAGS="$CFLAGS"
- fi
- 
- 
diff --git a/net/asterisk14/files/patch-formats::Makefile b/net/asterisk14/files/patch-formats::Makefile
deleted file mode 100644
index dacfd7b08303..000000000000
--- a/net/asterisk14/files/patch-formats::Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- formats/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ formats/Makefile	Fri Jan 30 01:47:34 2004
-@@ -18,7 +18,7 @@
- #
- # G723 simple frame is depricated
- #
--#FORMAT_LIBS+=format_g723.so
-+FORMAT_LIBS+=format_g723_1.so
- 
- GSMLIB=../codecs/gsm/lib/libgsm.a
- 
-@@ -40,7 +40,7 @@
- 	$(CC) $(SOLINK) -o $@ $< -lm
- 
- install: all
--	for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(FORMAT_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk14/files/patch-formats::format_g723_1.c b/net/asterisk14/files/patch-formats::format_g723_1.c
deleted file mode 100644
index 8d0755e14205..000000000000
--- a/net/asterisk14/files/patch-formats::format_g723_1.c
+++ /dev/null
@@ -1,351 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ formats/format_g723_1.c	Fri Jan 30 01:58:19 2004
-@@ -0,0 +1,345 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Save and read raw, headerless G723.1 Annex A data.
-+ *
-+ * Copyright (C) 1999, Mark Spencer <markster@linux-support.net>
-+ * Copyright (C) 2003, Maxim Sobolev <sobomax@FreeBSD.org>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#include <asterisk/lock.h>
-+#include <asterisk/channel.h>
-+#include <asterisk/file.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/sched.h>
-+#include <asterisk/module.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <stdlib.h>
-+#include <sys/time.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#include <string.h>
-+#include <pthread.h>
-+#ifdef __linux__
-+#include <endian.h>
-+#else
-+#include <machine/endian.h>
-+#endif
-+
-+/* Based on format_g729.c */
-+
-+#define TYPE_HIGH	0x0
-+#define TYPE_LOW	0x1
-+#define TYPE_SILENCE	0x2
-+#define TYPE_DONTSEND	0x3
-+#define TYPE_MASK	0x3
-+
-+struct ast_filestream {
-+	void *reserved[AST_RESERVED_POINTERS];
-+	/* This is what a filestream means to us */
-+	int fd; 				/* Descriptor */
-+	struct ast_frame fr;			/* Frame information */
-+	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
-+	char empty;				/* Empty character */
-+	unsigned char g723[24];			/* One Real G723.1 Frame */
-+};
-+
-+static long g723_tell(struct ast_filestream *);
-+
-+static ast_mutex_t g723_lock = AST_MUTEX_INITIALIZER;
-+static int glistcnt = 0;
-+
-+static char *name = "g723";
-+static char *desc = "Raw G723.1 Annex A data";
-+static char *exts = "g723";
-+
-+static int g723_len(unsigned char buf)
-+{
-+	switch(buf & TYPE_MASK) {
-+	case TYPE_DONTSEND:
-+		return 2;
-+		break;
-+	case TYPE_SILENCE:
-+		return 4;
-+		break;
-+	case TYPE_HIGH:
-+		return 24;
-+		break;
-+	case TYPE_LOW:
-+		return 20;
-+		break;
-+	default:
-+		ast_log(LOG_WARNING, "Badly encoded G723.1 frame (%d)\n", buf & TYPE_MASK);
-+	}
-+	return -1;
-+}
-+
-+static struct ast_filestream *g723_open(int fd)
-+{
-+	/* We don't have any header to read or anything really, but
-+	   if we did, it would go here.  We also might want to check
-+	   and be sure it's a valid file.  */
-+	struct ast_filestream *tmp;
-+	if ((tmp = malloc(sizeof(struct ast_filestream)))) {
-+		memset(tmp, 0, sizeof(struct ast_filestream));
-+		if (ast_mutex_lock(&g723_lock)) {
-+			ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+			free(tmp);
-+			return NULL;
-+		}
-+		tmp->fd = fd;
-+		tmp->fr.data = tmp->g723;
-+		tmp->fr.frametype = AST_FRAME_VOICE;
-+		tmp->fr.subclass = AST_FORMAT_G723_1;
-+		/* datalen will vary for each frame */
-+		tmp->fr.src = name;
-+		tmp->fr.mallocd = 0;
-+		glistcnt++;
-+		ast_mutex_unlock(&g723_lock);
-+		ast_update_use_count();
-+	}
-+	return tmp;
-+}
-+
-+static struct ast_filestream *g723_rewrite(int fd, char *comment)
-+{
-+	/* We don't have any header to read or anything really, but
-+	   if we did, it would go here.  We also might want to check
-+	   and be sure it's a valid file.  */
-+	struct ast_filestream *tmp;
-+	if ((tmp = malloc(sizeof(struct ast_filestream)))) {
-+		memset(tmp, 0, sizeof(struct ast_filestream));
-+		if (ast_mutex_lock(&g723_lock)) {
-+			ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+			free(tmp);
-+			return NULL;
-+		}
-+		tmp->fd = fd;
-+		glistcnt++;
-+		ast_mutex_unlock(&g723_lock);
-+		ast_update_use_count();
-+	} else
-+		ast_log(LOG_WARNING, "Out of memory\n");
-+	return tmp;
-+}
-+
-+static void g723_close(struct ast_filestream *s)
-+{
-+	if (ast_mutex_lock(&g723_lock)) {
-+		ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+		return;
-+	}
-+	glistcnt--;
-+	ast_mutex_unlock(&g723_lock);
-+	ast_update_use_count();
-+	close(s->fd);
-+	free(s);
-+	s = NULL;
-+}
-+
-+static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext)
-+{
-+	int res;
-+	/* Send a frame from the file to the appropriate channel */
-+	s->fr.frametype = AST_FRAME_VOICE;
-+	s->fr.subclass = AST_FORMAT_G723_1;
-+	s->fr.offset = AST_FRIENDLY_OFFSET;
-+	s->fr.samples = 240;
-+	s->fr.mallocd = 0;
-+	s->fr.data = s->g723;
-+	if ((res = read(s->fd, s->g723, 1)) != 1) {
-+		if (res)
-+			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
-+		return NULL;
-+	}
-+	s->fr.datalen = g723_len(s->g723[0]);
-+	if (s->fr.datalen < 0) {
-+		ast_log(LOG_WARNING, "Invalid G723.1 frame!\n");
-+		return NULL;
-+	}
-+	if (s->fr.datalen > 1 && (res = read(s->fd, s->g723 + 1, s->fr.datalen - 1)) != s->fr.datalen - 1) {
-+		if (res)
-+			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
-+		return NULL;
-+	}
-+	*whennext = s->fr.samples;
-+	return &s->fr;
-+}
-+
-+static int g723_write(struct ast_filestream *fs, struct ast_frame *f)
-+{
-+	int res;
-+	unsigned char *cp;
-+	if (f->frametype != AST_FRAME_VOICE) {
-+		ast_log(LOG_WARNING, "Asked to write non-voice frame!\n");
-+		return -1;
-+	}
-+	if (f->subclass != AST_FORMAT_G723_1) {
-+		ast_log(LOG_WARNING, "Asked to write non-G723.1 frame (%d)!\n", f->subclass);
-+		return -1;
-+	}
-+	for (cp = f->data; cp < (unsigned char *)f->data + f->datalen; cp += res) {
-+		res = g723_len(cp[0]);
-+		if (res < 0) {
-+			ast_log(LOG_WARNING, "Asked to write invalid G723.1 frame!\n");
-+			return -1;
-+		}
-+	}
-+	if (cp != (unsigned char *)f->data + f->datalen) {
-+		ast_log(LOG_WARNING, "Invalid G723.1 data length, %d\n", f->datalen);
-+		return -1;
-+	}
-+	if ((res = write(fs->fd, f->data, f->datalen)) != f->datalen) {
-+		ast_log(LOG_WARNING, "Bad write %d: %s\n", res, strerror(errno));
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static char *g723_getcomment(struct ast_filestream *s)
-+{
-+	return NULL;
-+}
-+
-+static int g723_seek(struct ast_filestream *fs, long sample_offset, int whence)
-+{
-+	long cur, offset, max;
-+	off_t coffset, moffset, soffset;
-+	int res;
-+	unsigned char c;
-+
-+	offset = 0;	/* Shut up gcc warning */
-+	if (whence == SEEK_SET) {
-+		offset = sample_offset;
-+	} else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) {
-+		if ((cur = g723_tell(fs)) == -1) {
-+			ast_log(LOG_WARNING, "Can't get current position!\n");
-+			return -1;
-+		}
-+		offset = cur + sample_offset;
-+	}
-+	if ((moffset = lseek(fs->fd, 0, SEEK_END)) == -1) {
-+		ast_log(LOG_WARNING, "Can't seek stream to an end!\n");
-+		return -1;
-+	}
-+	if (whence == SEEK_END) {
-+		if ((max = g723_tell(fs)) == -1) {
-+			ast_log(LOG_WARNING, "Can't get maximum position!\n");
-+			return -1;
-+		}
-+		offset = max - sample_offset;
-+	}
-+	if (offset < 0)
-+		offset = 0;
-+	soffset = -1;
-+	for (coffset = 0; coffset < moffset && offset > 0; coffset += res) {
-+		if (lseek(fs->fd, coffset, SEEK_SET) != coffset) {
-+			ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		if (read(fs->fd, &c, 1) != 1) {
-+			ast_log(LOG_WARNING, "Can't read from offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		soffset = coffset;
-+		if ((res = g723_len(c)) < 0) {
-+			ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		if (res > 1)
-+			offset -= 240;
-+	}
-+	if (soffset != -1 && lseek(fs->fd, soffset, SEEK_SET) != soffset) {
-+		ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", soffset);
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+static int g723_trunc(struct ast_filestream *fs)
-+{
-+	/* Truncate file to current length */
-+	if (ftruncate(fs->fd, lseek(fs->fd, 0, SEEK_CUR)) < 0)
-+		return -1;
-+	return 0;
-+}
-+
-+static long g723_tell(struct ast_filestream *fs)
-+{
-+	off_t offset, coffset;
-+	int res;
-+	long rval;
-+	unsigned char c;
-+
-+	offset = lseek(fs->fd, 0, SEEK_CUR);
-+	rval = 0;
-+	for (coffset = 0; coffset < offset; coffset += res) {
-+		if (lseek(fs->fd, coffset, SEEK_SET) != coffset) {
-+			ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if (read(fs->fd, &c, 1) != 1) {
-+			ast_log(LOG_WARNING, "Can't read from offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if ((res = g723_len(c)) < 0) {
-+			ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if (res > 1)
-+			rval += 240;
-+	}
-+	if (lseek(fs->fd, offset, SEEK_SET) != offset) {
-+		ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", offset);
-+		return -1;
-+	}
-+	return rval;
-+}
-+
-+int load_module()
-+{
-+	return ast_format_register(name, exts, AST_FORMAT_G723_1,
-+				   g723_open,
-+				   g723_rewrite,
-+				   g723_write,
-+				   g723_seek,
-+				   g723_trunc,
-+				   g723_tell,
-+				   g723_read,
-+				   g723_close,
-+				   g723_getcomment);
-+}
-+
-+int unload_module()
-+{
-+	return ast_format_unregister(name);
-+}
-+
-+int usecount()
-+{
-+	int res;
-+	if (ast_mutex_lock(&g723_lock)) {
-+		ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+		return -1;
-+	}
-+	res = glistcnt;
-+	ast_mutex_unlock(&g723_lock);
-+	return res;
-+}
-+
-+char *description()
-+{
-+	return desc;
-+}
-+
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk14/files/patch-formats::format_g729.c b/net/asterisk14/files/patch-formats::format_g729.c
deleted file mode 100644
index a144d1b0f6bf..000000000000
--- a/net/asterisk14/files/patch-formats::format_g729.c
+++ /dev/null
@@ -1,47 +0,0 @@
-
-$FreeBSD$
-
---- formats/format_g729.c.orig	Wed Jan 28 23:32:48 2004
-+++ formats/format_g729.c	Thu Feb 19 01:03:30 2004
-@@ -45,7 +45,7 @@
- 	struct ast_frame fr;				/* Frame information */
- 	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
- 	char empty;							/* Empty character */
--	unsigned char g729[20];				/* Two Real G729 Frames */
-+	unsigned char g729[10];				/* One Real G729 Frame */
- };
- 
- 
-@@ -126,11 +126,11 @@
- 	s->fr.frametype = AST_FRAME_VOICE;
- 	s->fr.subclass = AST_FORMAT_G729A;
- 	s->fr.offset = AST_FRIENDLY_OFFSET;
--	s->fr.samples = 160;
--	s->fr.datalen = 20;
-+	s->fr.samples = 80;
-+	s->fr.datalen = 10;
- 	s->fr.mallocd = 0;
- 	s->fr.data = s->g729;
--	if ((res = read(s->fd, s->g729, 20)) != 20) {
-+	if ((res = read(s->fd, s->g729, 10)) != 10) {
- 		if (res)
- 			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
- 		return NULL;
-@@ -174,7 +174,7 @@
- 	cur = lseek(fs->fd, 0, SEEK_CUR);
- 	max = lseek(fs->fd, 0, SEEK_END);
- 	
--	bytes = 20 * (sample_offset / 160);
-+	bytes = 10 * (sample_offset / 80);
- 	if (whence == SEEK_SET)
- 		offset = bytes;
- 	else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
-@@ -202,7 +202,7 @@
- {
- 	off_t offset;
- 	offset = lseek(fs->fd, 0, SEEK_CUR);
--	return (offset/20)*160;
-+	return (offset/10)*80;
- }
- 
- int load_module()
diff --git a/net/asterisk14/files/patch-pbx::Makefile b/net/asterisk14/files/patch-pbx::Makefile
deleted file mode 100644
index dca6672c389a..000000000000
--- a/net/asterisk14/files/patch-pbx::Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- pbx/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ pbx/Makefile	Fri Jan 30 01:47:34 2004
-@@ -16,7 +16,7 @@
- PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so     # pbx_gtkconsole.so pbx_kdeconsole.so
- 
- # Add GTK console if appropriate
--PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
-+#PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
- # Add KDE Console if appropriate
- #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so")
- 
-@@ -62,7 +62,7 @@
- endif
- 
- install: all
--	for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(PBX_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk14/files/patch-res::Makefile b/net/asterisk14/files/patch-res::Makefile
deleted file mode 100644
index ccd0a35dd59d..000000000000
--- a/net/asterisk14/files/patch-res::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- res/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ res/Makefile	Fri Jan 30 01:47:34 2004
-@@ -25,7 +25,7 @@
- all: depend $(MODS)
- 
- install: all
--	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- res_crypto.so: res_crypto.o
- 	$(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS)
diff --git a/net/asterisk14/pkg-descr b/net/asterisk14/pkg-descr
deleted file mode 100644
index 28b7a1deb011..000000000000
--- a/net/asterisk14/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
-sense, middleware between Internet and telephony channels on the bottom,
-and Internet and telephony applications at the top.
-
-WWW: http://www.asteriskpbx.com
diff --git a/net/asterisk14/pkg-plist b/net/asterisk14/pkg-plist
deleted file mode 100644
index ab3eff23ff6e..000000000000
--- a/net/asterisk14/pkg-plist
+++ /dev/null
@@ -1,462 +0,0 @@
-@unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi
-etc/asterisk/adsi.conf-dist
-@exec [ -f %B/adsi.conf ] || cp %B/%f %B/adsi.conf
-@unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi
-etc/asterisk/adtranvofr.conf-dist
-@exec [ -f %B/adtranvofr.conf ] || cp %B/%f %B/adtranvofr.conf
-@unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi
-etc/asterisk/agents.conf-dist
-@exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf
-@unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi
-etc/asterisk/alsa.conf-dist
-@exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf
-@unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi
-etc/asterisk/asterisk.adsi-dist
-@exec [ -f %B/asterisk.adsi ] || cp %B/%f %B/asterisk.adsi
-@unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi
-etc/asterisk/asterisk.conf-dist
-@exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf
-@unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi
-etc/asterisk/cdr_odbc.conf-dist
-@exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf
-@unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi
-etc/asterisk/cdr_pgsql.conf-dist
-@exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf
-@unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi
-etc/asterisk/enum.conf-dist
-@exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf
-@unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi
-etc/asterisk/extensions.conf-dist
-@exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf
-@unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
-etc/asterisk/festival.conf-dist
-@exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
-@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
-etc/asterisk/h323.conf-dist
-@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.conf
-@unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
-etc/asterisk/iax.conf-dist
-@exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
-@unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi
-etc/asterisk/indications.conf-dist
-@exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf
-@unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi
-etc/asterisk/logger.conf-dist
-@exec [ -f %B/logger.conf ] || cp %B/%f %B/logger.conf
-@unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi
-etc/asterisk/manager.conf-dist
-@exec [ -f %B/manager.conf ] || cp %B/%f %B/manager.conf
-@unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi
-etc/asterisk/meetme.conf-dist
-@exec [ -f %B/meetme.conf ] || cp %B/%f %B/meetme.conf
-@unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi
-etc/asterisk/mgcp.conf-dist
-@exec [ -f %B/mgcp.conf ] || cp %B/%f %B/mgcp.conf
-@unexec if cmp -s %D/etc/asterisk/modem.conf %D/etc/asterisk/modem.conf-dist; then rm -f %D/etc/asterisk/modem.conf; fi
-etc/asterisk/modem.conf-dist
-@exec [ -f %B/modem.conf ] || cp %B/%f %B/modem.conf
-@unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi
-etc/asterisk/modules.conf-dist
-@exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf
-@unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi
-etc/asterisk/musiconhold.conf-dist
-@exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf
-@unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi
-etc/asterisk/oss.conf-dist
-@exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf
-@unexec if cmp -s %D/etc/asterisk/parking.conf %D/etc/asterisk/parking.conf-dist; then rm -f %D/etc/asterisk/parking.conf; fi
-etc/asterisk/parking.conf-dist
-@exec [ -f %B/parking.conf ] || cp %B/%f %B/parking.conf
-@unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi
-etc/asterisk/phone.conf-dist
-@exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf
-@unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi
-etc/asterisk/privacy.conf-dist
-@exec [ -f %B/privacy.conf ] || cp %B/%f %B/privacy.conf
-@unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi
-etc/asterisk/queues.conf-dist
-@exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf
-@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi
-etc/asterisk/rpt.conf-dist
-@exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf
-@unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi
-etc/asterisk/rtp.conf-dist
-@exec [ -f %B/rtp.conf ] || cp %B/%f %B/rtp.conf
-@unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi
-etc/asterisk/sip.conf-dist
-@exec [ -f %B/sip.conf ] || cp %B/%f %B/sip.conf
-@unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi
-etc/asterisk/skinny.conf-dist
-@exec [ -f %B/skinny.conf ] || cp %B/%f %B/skinny.conf
-@unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi
-etc/asterisk/telcordia-1.adsi-dist
-@exec [ -f %B/telcordia-1.adsi ] || cp %B/%f %B/telcordia-1.adsi
-@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi
-etc/asterisk/voicemail.conf-dist
-@exec [ -f %B/voicemail.conf ] || cp %B/%f %B/voicemail.conf
-@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi
-etc/asterisk/vpb.conf-dist
-@exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf
-@unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi
-etc/asterisk/zapata.conf-dist
-@exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf
-include/asterisk/acl.h
-include/asterisk/adsi.h
-include/asterisk/aes.h
-include/asterisk/alaw.h
-include/asterisk/app.h
-include/asterisk/ast_expr.h
-include/asterisk/astdb.h
-include/asterisk/astmm.h
-include/asterisk/callerid.h
-include/asterisk/causes.h
-include/asterisk/cdr.h
-include/asterisk/channel.h
-include/asterisk/channel_pvt.h
-include/asterisk/chanvars.h
-include/asterisk/cli.h
-include/asterisk/config.h
-include/asterisk/crypto.h
-include/asterisk/cvsid.h
-include/asterisk/dlfcn-compat.h
-include/asterisk/dns.h
-include/asterisk/dsp.h
-include/asterisk/enum.h
-include/asterisk/file.h
-include/asterisk/frame.h
-include/asterisk/fskmodem.h
-include/asterisk/image.h
-include/asterisk/indications.h
-include/asterisk/io.h
-include/asterisk/linkedlists.h
-include/asterisk/localtime.h
-include/asterisk/lock.h
-include/asterisk/logger.h
-include/asterisk/manager.h
-include/asterisk/md5.h
-include/asterisk/module.h
-include/asterisk/monitor.h
-include/asterisk/musiconhold.h
-include/asterisk/options.h
-include/asterisk/parking.h
-include/asterisk/pbx.h
-include/asterisk/poll-compat.h
-include/asterisk/privacy.h
-include/asterisk/rtp.h
-include/asterisk/say.h
-include/asterisk/sched.h
-include/asterisk/srv.h
-include/asterisk/tdd.h
-include/asterisk/term.h
-include/asterisk/translate.h
-include/asterisk/ulaw.h
-include/asterisk/vmodem.h
-lib/asterisk/modules/app_adsiprog.so
-lib/asterisk/modules/app_agi.so
-lib/asterisk/modules/app_authenticate.so
-lib/asterisk/modules/app_cdr.so
-lib/asterisk/modules/app_chanisavail.so
-lib/asterisk/modules/app_cut.so
-lib/asterisk/modules/app_datetime.so
-lib/asterisk/modules/app_db.so
-lib/asterisk/modules/app_dial.so
-lib/asterisk/modules/app_directory.so
-lib/asterisk/modules/app_disa.so
-lib/asterisk/modules/app_echo.so
-lib/asterisk/modules/app_enumlookup.so
-lib/asterisk/modules/app_festival.so
-lib/asterisk/modules/app_getcpeid.so
-lib/asterisk/modules/app_hasnewvoicemail.so
-lib/asterisk/modules/app_image.so
-lib/asterisk/modules/app_intercom.so
-lib/asterisk/modules/app_lookupblacklist.so
-lib/asterisk/modules/app_lookupcidname.so
-lib/asterisk/modules/app_macro.so
-lib/asterisk/modules/app_milliwatt.so
-lib/asterisk/modules/app_mp3.so
-lib/asterisk/modules/app_parkandannounce.so
-lib/asterisk/modules/app_playback.so
-lib/asterisk/modules/app_privacy.so
-lib/asterisk/modules/app_qcall.so
-lib/asterisk/modules/app_queue.so
-lib/asterisk/modules/app_random.so
-lib/asterisk/modules/app_read.so
-lib/asterisk/modules/app_record.so
-lib/asterisk/modules/app_sayunixtime.so
-lib/asterisk/modules/app_senddtmf.so
-lib/asterisk/modules/app_setcallerid.so
-lib/asterisk/modules/app_setcdruserfield.so
-lib/asterisk/modules/app_setcidname.so
-lib/asterisk/modules/app_setcidnum.so
-lib/asterisk/modules/app_softhangup.so
-lib/asterisk/modules/app_striplsd.so
-lib/asterisk/modules/app_substring.so
-lib/asterisk/modules/app_system.so
-lib/asterisk/modules/app_transfer.so
-lib/asterisk/modules/app_url.so
-lib/asterisk/modules/app_voicemail.so
-lib/asterisk/modules/app_waitforring.so
-lib/asterisk/modules/app_zapateller.so
-lib/asterisk/modules/cdr_csv.so
-lib/asterisk/modules/chan_agent.so
-lib/asterisk/modules/chan_h323.so
-lib/asterisk/modules/chan_iax.so
-lib/asterisk/modules/chan_iax2.so
-lib/asterisk/modules/chan_local.so
-lib/asterisk/modules/chan_mgcp.so
-lib/asterisk/modules/chan_modem.so
-lib/asterisk/modules/chan_modem_aopen.so
-lib/asterisk/modules/chan_modem_bestdata.so
-lib/asterisk/modules/chan_modem_i4l.so
-lib/asterisk/modules/chan_oss.so
-lib/asterisk/modules/chan_sip.so
-lib/asterisk/modules/chan_skinny.so
-lib/asterisk/modules/codec_a_mu.so
-lib/asterisk/modules/codec_adpcm.so
-lib/asterisk/modules/codec_alaw.so
-lib/asterisk/modules/codec_g723_1_dummy.so
-lib/asterisk/modules/codec_g729_dummy.so
-lib/asterisk/modules/codec_gsm.so
-lib/asterisk/modules/codec_ilbc.so
-lib/asterisk/modules/codec_lpc10.so
-lib/asterisk/modules/codec_speex.so
-lib/asterisk/modules/codec_ulaw.so
-lib/asterisk/modules/format_g723_1.so
-lib/asterisk/modules/format_g729.so
-lib/asterisk/modules/format_gsm.so
-lib/asterisk/modules/format_h263.so
-lib/asterisk/modules/format_jpeg.so
-lib/asterisk/modules/format_pcm.so
-lib/asterisk/modules/format_pcm_alaw.so
-lib/asterisk/modules/format_vox.so
-lib/asterisk/modules/format_wav.so
-lib/asterisk/modules/format_wav_gsm.so
-lib/asterisk/modules/pbx_config.so
-lib/asterisk/modules/pbx_spool.so
-lib/asterisk/modules/pbx_wilcalu.so
-lib/asterisk/modules/res_adsi.so
-lib/asterisk/modules/res_crypto.so
-lib/asterisk/modules/res_indications.so
-lib/asterisk/modules/res_monitor.so
-lib/asterisk/modules/res_musiconhold.so
-lib/asterisk/modules/res_parking.so
-sbin/asterisk
-sbin/astgenkey
-sbin/safe_asterisk
-share/asterisk/agi-bin/agi-test.agi
-share/asterisk/agi-bin/eagi-sphinx-test
-share/asterisk/agi-bin/eagi-test
-share/asterisk/images/asterisk-intro.jpg
-share/asterisk/keys/iaxtel.pub
-share/asterisk/mohmp3/sample-hold.mp3
-share/asterisk/sounds/agent-alreadyon.gsm
-share/asterisk/sounds/agent-incorrect.gsm
-share/asterisk/sounds/agent-loggedoff.gsm
-share/asterisk/sounds/agent-loginok.gsm
-share/asterisk/sounds/agent-newlocation.gsm
-share/asterisk/sounds/agent-pass.gsm
-share/asterisk/sounds/agent-user.gsm
-share/asterisk/sounds/auth-incorrect.gsm
-share/asterisk/sounds/auth-thankyou.gsm
-share/asterisk/sounds/beep.gsm
-share/asterisk/sounds/conf-getchannel.gsm
-share/asterisk/sounds/conf-getconfno.gsm
-share/asterisk/sounds/conf-getpin.gsm
-share/asterisk/sounds/conf-invalid.gsm
-share/asterisk/sounds/conf-invalidpin.gsm
-share/asterisk/sounds/conf-onlyperson.gsm
-share/asterisk/sounds/demo-abouttotry.gsm
-share/asterisk/sounds/demo-congrats.gsm
-share/asterisk/sounds/demo-echodone.gsm
-share/asterisk/sounds/demo-echotest.gsm
-share/asterisk/sounds/demo-enterkeywords.gsm
-share/asterisk/sounds/demo-instruct.gsm
-share/asterisk/sounds/demo-moreinfo.gsm
-share/asterisk/sounds/demo-nogo.gsm
-share/asterisk/sounds/demo-nomatch.gsm
-share/asterisk/sounds/demo-thanks.gsm
-share/asterisk/sounds/digits/0.gsm
-share/asterisk/sounds/digits/1.gsm
-share/asterisk/sounds/digits/10.gsm
-share/asterisk/sounds/digits/11.gsm
-share/asterisk/sounds/digits/12.gsm
-share/asterisk/sounds/digits/13.gsm
-share/asterisk/sounds/digits/14.gsm
-share/asterisk/sounds/digits/15.gsm
-share/asterisk/sounds/digits/16.gsm
-share/asterisk/sounds/digits/17.gsm
-share/asterisk/sounds/digits/18.gsm
-share/asterisk/sounds/digits/19.gsm
-share/asterisk/sounds/digits/2.gsm
-share/asterisk/sounds/digits/20.gsm
-share/asterisk/sounds/digits/3.gsm
-share/asterisk/sounds/digits/30.gsm
-share/asterisk/sounds/digits/4.gsm
-share/asterisk/sounds/digits/40.gsm
-share/asterisk/sounds/digits/5.gsm
-share/asterisk/sounds/digits/50.gsm
-share/asterisk/sounds/digits/6.gsm
-share/asterisk/sounds/digits/60.gsm
-share/asterisk/sounds/digits/7.gsm
-share/asterisk/sounds/digits/70.gsm
-share/asterisk/sounds/digits/8.gsm
-share/asterisk/sounds/digits/80.gsm
-share/asterisk/sounds/digits/9.gsm
-share/asterisk/sounds/digits/90.gsm
-share/asterisk/sounds/digits/a-m.gsm
-share/asterisk/sounds/digits/at.gsm
-share/asterisk/sounds/digits/day-0.gsm
-share/asterisk/sounds/digits/day-1.gsm
-share/asterisk/sounds/digits/day-2.gsm
-share/asterisk/sounds/digits/day-3.gsm
-share/asterisk/sounds/digits/day-4.gsm
-share/asterisk/sounds/digits/day-5.gsm
-share/asterisk/sounds/digits/day-6.gsm
-share/asterisk/sounds/digits/dollars.gsm
-share/asterisk/sounds/digits/h-1.gsm
-share/asterisk/sounds/digits/h-10.gsm
-share/asterisk/sounds/digits/h-11.gsm
-share/asterisk/sounds/digits/h-12.gsm
-share/asterisk/sounds/digits/h-13.gsm
-share/asterisk/sounds/digits/h-14.gsm
-share/asterisk/sounds/digits/h-15.gsm
-share/asterisk/sounds/digits/h-16.gsm
-share/asterisk/sounds/digits/h-17.gsm
-share/asterisk/sounds/digits/h-18.gsm
-share/asterisk/sounds/digits/h-19.gsm
-share/asterisk/sounds/digits/h-2.gsm
-share/asterisk/sounds/digits/h-20.gsm
-share/asterisk/sounds/digits/h-3.gsm
-share/asterisk/sounds/digits/h-30.gsm
-share/asterisk/sounds/digits/h-4.gsm
-share/asterisk/sounds/digits/h-5.gsm
-share/asterisk/sounds/digits/h-6.gsm
-share/asterisk/sounds/digits/h-7.gsm
-share/asterisk/sounds/digits/h-8.gsm
-share/asterisk/sounds/digits/h-9.gsm
-share/asterisk/sounds/digits/hundred.gsm
-share/asterisk/sounds/digits/million.gsm
-share/asterisk/sounds/digits/mon-0.gsm
-share/asterisk/sounds/digits/mon-1.gsm
-share/asterisk/sounds/digits/mon-10.gsm
-share/asterisk/sounds/digits/mon-11.gsm
-share/asterisk/sounds/digits/mon-2.gsm
-share/asterisk/sounds/digits/mon-3.gsm
-share/asterisk/sounds/digits/mon-4.gsm
-share/asterisk/sounds/digits/mon-5.gsm
-share/asterisk/sounds/digits/mon-6.gsm
-share/asterisk/sounds/digits/mon-7.gsm
-share/asterisk/sounds/digits/mon-8.gsm
-share/asterisk/sounds/digits/mon-9.gsm
-share/asterisk/sounds/digits/oclock.gsm
-share/asterisk/sounds/digits/oh.gsm
-share/asterisk/sounds/digits/p-m.gsm
-share/asterisk/sounds/digits/pound.gsm
-share/asterisk/sounds/digits/star.gsm
-share/asterisk/sounds/digits/thousand.gsm
-share/asterisk/sounds/digits/today.gsm
-share/asterisk/sounds/digits/tomorrow.gsm
-share/asterisk/sounds/digits/yesterday.gsm
-share/asterisk/sounds/dir-instr.gsm
-share/asterisk/sounds/dir-intro.gsm
-share/asterisk/sounds/dir-nomatch.gsm
-share/asterisk/sounds/dir-nomore.gsm
-share/asterisk/sounds/invalid.gsm
-share/asterisk/sounds/pbx-invalid.gsm
-share/asterisk/sounds/pbx-invalidpark.gsm
-share/asterisk/sounds/pbx-transfer.gsm
-share/asterisk/sounds/privacy-incorrect.gsm
-share/asterisk/sounds/privacy-prompt.gsm
-share/asterisk/sounds/privacy-thankyou.gsm
-share/asterisk/sounds/privacy-unident.gsm
-share/asterisk/sounds/ss-noservice.gsm
-share/asterisk/sounds/transfer.gsm
-share/asterisk/sounds/tt-allbusy.gsm
-share/asterisk/sounds/tt-monkeys.gsm
-share/asterisk/sounds/tt-monkeysintro.gsm
-share/asterisk/sounds/tt-somethingwrong.gsm
-share/asterisk/sounds/tt-weasels.gsm
-share/asterisk/sounds/vm
-share/asterisk/sounds/vm-Family.gsm
-share/asterisk/sounds/vm-Friends.gsm
-share/asterisk/sounds/vm-INBOX.gsm
-share/asterisk/sounds/vm-Old.gsm
-share/asterisk/sounds/vm-Work.gsm
-share/asterisk/sounds/vm-and.gsm
-share/asterisk/sounds/vm-changeto.gsm
-share/asterisk/sounds/vm-delete.gsm
-share/asterisk/sounds/vm-deleted.gsm
-share/asterisk/sounds/vm-extension.gsm
-share/asterisk/sounds/vm-first.gsm
-share/asterisk/sounds/vm-for.gsm
-share/asterisk/sounds/vm-forwardoptions.gsm
-share/asterisk/sounds/vm-goodbye.gsm
-share/asterisk/sounds/vm-helpexit.gsm
-share/asterisk/sounds/vm-incorrect.gsm
-share/asterisk/sounds/vm-instructions.gsm
-share/asterisk/sounds/vm-intro.gsm
-share/asterisk/sounds/vm-isonphone.gsm
-share/asterisk/sounds/vm-isunavail.gsm
-share/asterisk/sounds/vm-last.gsm
-share/asterisk/sounds/vm-login.gsm
-share/asterisk/sounds/vm-mailboxfull.gsm
-share/asterisk/sounds/vm-message.gsm
-share/asterisk/sounds/vm-messages.gsm
-share/asterisk/sounds/vm-mismatch.gsm
-share/asterisk/sounds/vm-msginstruct.gsm
-share/asterisk/sounds/vm-msgsaved.gsm
-share/asterisk/sounds/vm-newpassword.gsm
-share/asterisk/sounds/vm-next.gsm
-share/asterisk/sounds/vm-no.gsm
-share/asterisk/sounds/vm-nobodyavail.gsm
-share/asterisk/sounds/vm-nomore.gsm
-share/asterisk/sounds/vm-onefor.gsm
-share/asterisk/sounds/vm-options.gsm
-share/asterisk/sounds/vm-opts.gsm
-share/asterisk/sounds/vm-passchanged.gsm
-share/asterisk/sounds/vm-password.gsm
-share/asterisk/sounds/vm-press.gsm
-share/asterisk/sounds/vm-prev.gsm
-share/asterisk/sounds/vm-rec-busy.gsm
-share/asterisk/sounds/vm-rec-name.gsm
-share/asterisk/sounds/vm-rec-unv.gsm
-share/asterisk/sounds/vm-received.gsm
-share/asterisk/sounds/vm-reenterpassword.gsm
-share/asterisk/sounds/vm-repeat.gsm
-share/asterisk/sounds/vm-saved.gsm
-share/asterisk/sounds/vm-savedto.gsm
-share/asterisk/sounds/vm-savefolder.gsm
-share/asterisk/sounds/vm-savemessage.gsm
-share/asterisk/sounds/vm-sorry.gsm
-share/asterisk/sounds/vm-theperson.gsm
-share/asterisk/sounds/vm-tocancel.gsm
-share/asterisk/sounds/vm-toforward.gsm
-share/asterisk/sounds/vm-undelete.gsm
-share/asterisk/sounds/vm-undeleted.gsm
-share/asterisk/sounds/vm-whichbox.gsm
-share/asterisk/sounds/vm-youhave.gsm
-share/asterisk/sounds/voicemail
-@dirrm share/asterisk/sounds/digits
-@dirrm share/asterisk/sounds
-@dirrm share/asterisk/mohmp3
-@dirrm share/asterisk/keys
-@dirrm share/asterisk/images
-@dirrm share/asterisk/agi-bin
-@dirrm share/asterisk
-@dirrm lib/asterisk/modules
-@dirrm lib/asterisk
-@dirrm include/asterisk
-@dirrm etc/asterisk
-@cwd /var
-spool/asterisk/vm
-spool/asterisk/voicemail/default/1234/busy.gsm
-spool/asterisk/voicemail/default/1234/unavail.gsm
-@exec mkdir -p %D/log/asterisk/cdr-csv
-@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX
-@dirrm spool/asterisk/voicemail/default/1234/INBOX
-@dirrm spool/asterisk/voicemail/default/1234
-@dirrm spool/asterisk/voicemail/default
-@dirrm spool/asterisk/voicemail
-@dirrm spool/asterisk
-@dirrm log/asterisk/cdr-csv
-@dirrm log/asterisk
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
deleted file mode 100644
index 82db2899e80a..000000000000
--- a/net/asterisk16/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for:	asterisk
-# Date created:				17 October 2003
-# Whom:					Maxim Sobolev <sobomax@portaone.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	asterisk
-PORTVERSION=	0.7.2
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
-		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
-
-MAINTAINER=	sobomax@FreeBSD.org
-COMMENT=	An Open Source PBX and telephony toolkit
-
-FORBIDDEN=	http://people.freebsd.org/~eik/portaudit/27c331d5-64c7-11d8-80e3-0020ed76ef5a.html
-
-ONLY_FOR_ARCHS=	i386
-
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
-		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
-LIB_DEPENDS=	speex.2:${PORTSDIR}/audio/speex
-RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
-
-GNU_CONFIGURE=	yes
-CONFIGURE_WRKSRC=	${WRKSRC}/editline
-USE_GMAKE=	yes
-USE_OPENLDAP=	yes
-MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		MKDIR="${MKDIR}" \
-		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \
-		OSVERSION=${OSVERSION} \
-		CXX="${CXX}"
-
-.include <bsd.port.mk>
diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo
deleted file mode 100644
index 13e376bb0fae..000000000000
--- a/net/asterisk16/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (asterisk-0.7.2.tar.gz) = a1f9485f5f85a4e4129782b6e642e236
-SIZE (asterisk-0.7.2.tar.gz) = 2779788
diff --git a/net/asterisk16/files/patch-Makefile b/net/asterisk16/files/patch-Makefile
deleted file mode 100644
index 1e4ffbe62070..000000000000
--- a/net/asterisk16/files/patch-Makefile
+++ /dev/null
@@ -1,301 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig	Wed Jan 14 08:48:38 2004
-+++ Makefile	Fri Jan 30 02:25:09 2004
-@@ -43,10 +43,10 @@
- #K6OPT  = -DK6OPT
- 
- #Tell gcc to optimize the asterisk's code
--OPTIMIZE=-O6
-+#OPTIMIZE=-O6
- 
- #Include debug symbols in the executables (-g) and profiling info (-pg)
--DEBUG=-g #-pg
-+#DEBUG=-g #-pg
- 
- # New hangup routines for chan_zap.c
- # If this flag is uncommented then you need to have new libpri code in your system
-@@ -68,7 +68,7 @@
- 
- # Where to install asterisk after compiling
- # Default -> leave empty
--INSTALL_PREFIX=
-+INSTALL_PREFIX=$(PREFIX)
- 
- # Staging directory
- # Files are copied here temporarily during the install process
-@@ -88,28 +88,26 @@
- # Don't use together with -DBUSYDETECT_TONEONLY
- BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
- 
--ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
--ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
-+ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk
-+ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk
- ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
--ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
--ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
--ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
-+ASTSPOOLDIR=/var/spool/asterisk
-+ASTLOGDIR=/var/log/asterisk
-+ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk
- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
--ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
--ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
--ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
-+ASTBINDIR=$(INSTALL_PREFIX)/bin
-+ASTSBINDIR=$(INSTALL_PREFIX)/sbin
-+ASTVARRUNDIR=/var/run
- 
- MODULES_DIR=$(ASTLIBDIR)/modules
- AGI_DIR=$(ASTVARLIBDIR)/agi-bin
- 
- INCLUDE=-Iinclude -I../include
--CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
- CFLAGS+=$(OPTIMIZE)
--CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- ifeq (${OSARCH},FreeBSD)
--CFLAGS+=-pthread
--INCLUDE+=-I/usr/local/include
-+CFLAGS+=$(PTHREAD_CFLAGS)
- endif
- ifeq (${OSARCH},OpenBSD)
- CFLAGS+=-pthread
-@@ -151,7 +149,7 @@
- LIBS=-pthread
- else
- ifeq (${OSARCH},FreeBSD)
--LIBS=-pthread
-+LIBS=$(PTHREAD_LIBS)
- else
- endif
- endif
-@@ -179,7 +177,7 @@
- SOLINK=-shared -Xlinker -x
- endif
- 
--CC=gcc
-+CC?=gcc
- INSTALL=install
- 
- _all: all
-@@ -200,13 +198,13 @@
- 	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
- 	$(MAKE) -C editline libedit.a
- 
--db1-ast/libdb1.a: FORCE
--	@if [ -d db1-ast ]; then \
--		$(MAKE) -C db1-ast libdb1.a ; \
--	else \
--		echo "You need to do a cvs update -d not just cvs update"; \
--		exit 1; \
--	fi
-+#db1-ast/libdb1.a: FORCE
-+#	@if [ -d db1-ast ]; then \
-+#		$(MAKE) -C db1-ast libdb1.a ; \
-+#	else \
-+#		echo "You need to do a cvs update -d not just cvs update"; \
-+#		exit 1; \
-+#	fi
- 
- ifneq ($(wildcard .depend),)
- include .depend
-@@ -244,8 +242,8 @@
- 		exit 1; \
- 	fi
- 
--asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
--	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a
-+asterisk: editline/libedit.a stdtime/libtime.a $(OBJS)
-+	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) stdtime/libtime.a
- 
- subdirs: 
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
-@@ -260,10 +258,10 @@
- 	$(MAKE) -C stdtime clean
- 
- datafiles: all
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
- 	for x in sounds/digits/*.gsm; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
-@@ -271,18 +269,18 @@
- 	done
- 	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-*; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
- 		fi; \
- 	done
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/images
- 	for x in images/*.jpg; do \
--		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
- 	done
--	mkdir -p $(DESTDIR)$(AGI_DIR)
-+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
- 
- update: 
- 	@if [ -d CVS ]; then \
-@@ -294,105 +292,74 @@
- 	fi
- 
- bininstall: all
--	mkdir -p $(DESTDIR)$(MODULES_DIR)
--	mkdir -p $(DESTDIR)$(ASTSBINDIR)
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	mkdir -p $(DESTDIR)$(ASTBINDIR)
--	mkdir -p $(DESTDIR)$(ASTSBINDIR)
--	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
--	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
--	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
-+	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
-+	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
- 	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
--		install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
-+		$(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
- 	fi
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
--	install -d $(DESTDIR)$(ASTHEADERDIR)
--	install -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
-+	$(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
- 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm
--	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail
--	if [ ! -h $(DESTDIR)$(ASTSPOOLDIR)/vm ] && [ -d $(DESTDIR)$(ASTSPOOLDIR)/vm ]; then \
--		mv $(DESTDIR)$(ASTSPOOLDIR)/vm $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \
--	else \
--		mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \
--		rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \
--	fi
--	ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_ixj.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_tor.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_mysql.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_unixodbc.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/codec_mp3_d.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/format_mp3.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/app_voicemail2.so
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
--	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
--	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
--	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
--	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/vm . )
--	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
--	@echo " +---- Asterisk Installation Complete -------+"  
--	@echo " +                                           +"
--	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
--	@echo " +                                           +"
--	@echo " + Asterisk has successfully been installed. +"  
--	@echo " + If you would like to install the sample   +"  
--	@echo " + configuration files (overwriting any      +"
--	@echo " + existing config files), run:              +"  
--	@echo " +                                           +"
--	@echo " +               $(MAKE) samples                +"
--	@echo " +                                           +"
--	@echo " +-----------------  or ---------------------+"
--	@echo " +                                           +"
--	@echo " + You can go ahead and install the asterisk +"
--	@echo " + program documentation now or later run:   +"
--	@echo " +                                           +"
--	@echo " +              $(MAKE) progdocs                +"
--	@echo " +                                           +"
--	@echo " + **Note** This requires that you have      +"
--	@echo " + doxygen installed on your local system    +"
--	@echo " +-------------------------------------------+"
-+	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/vm . )
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/voicemail . )
- 
--install: all datafiles bininstall
-+install: all datafiles bininstall samples
- 
- upgrade: all bininstall
- 
- adsi: all
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
- 	for x in configs/*.adsi; do \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x`-dist; \
- 		if ! [ -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \
--			install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
- 		fi ; \
- 	done
- 
- samples: all datafiles adsi
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	for x in configs/*.sample; do \
--		if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
--			mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	for x in configs/*.sample channels/h323/*.sample; do \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\
-+		if ! [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
- 		fi ; \
--		install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
- 	done
--	echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
--	echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
-+	echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
-+	if ! [ -f $(DESTDIR)$(ASTETCDIR)/asterisk.conf ]; then \
-+		$(BSD_INSTALL_DATA) $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist $(DESTDIR)$(ASTETCDIR)/asterisk.conf; \
-+	fi
- 	for x in sounds/demo-*; do \
- 		if grep -q "^%`basename $$x`%" sounds.txt; then \
--			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
- 		else \
- 			echo "No description for $$x"; \
- 			exit 1; \
- 		fi; \
- 	done
- 	for x in sounds/*.mp3; do \
--		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
- 	done
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
- 	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
- 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
- 		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
diff --git a/net/asterisk16/files/patch-agi::Makefile b/net/asterisk16/files/patch-agi::Makefile
deleted file mode 100644
index 567c30f5624e..000000000000
--- a/net/asterisk16/files/patch-agi::Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-
-$FreeBSD$
-
---- agi/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ agi/Makefile	Fri Jan 30 02:31:07 2004
-@@ -11,21 +11,24 @@
- # the GNU General Public License
- #
- 
--AGIS=agi-test.agi eagi-test eagi-sphinx-test
-+AGIS_BIN=eagi-test eagi-sphinx-test
-+AGIS_SCR=agi-test.agi
-+AGIS=$(AGIS_SCR) $(AGIS_BIN)
- 
- CFLAGS+=
- 
- all: depend $(AGIS)
- 
- install: all
--	mkdir -p $(DESTDIR)$(AGI_DIR)
--	for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
-+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
-+	for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done
-+	for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
- 
- eagi-test: eagi-test.o
--	$(CC) -o eagi-test eagi-test.o
-+	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
- 	
- eagi-sphinx-test: eagi-sphinx-test.o
--	$(CC) -o eagi-sphinx-test eagi-sphinx-test.o
-+	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o
- 
- clean:
- 	rm -f *.so *.o look .depend
diff --git a/net/asterisk16/files/patch-apps::Makefile b/net/asterisk16/files/patch-apps::Makefile
deleted file mode 100644
index 901ba694c33a..000000000000
--- a/net/asterisk16/files/patch-apps::Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- apps/Makefile.orig	Mon Jan 12 03:56:38 2004
-+++ apps/Makefile	Fri Jan 30 01:47:34 2004
-@@ -59,17 +59,17 @@
- 	$(CC) $(SOLINK) -o $@ $< -ltonezone
- 
- install: all
--	for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- app_todd.o: app_todd.c
--	gcc -pipe -O6 -g  -Iinclude -I../include -D_REENTRANT -march=i586 -DDO_CRASH -c -o  app_todd.o app_todd.c
-+	$(CC) $(CFLAGS) -Iinclude -I../include -D_REENTRANT -DDO_CRASH -c -o  app_todd.o app_todd.c
- 
- app_todd.so: app_todd.o
--	$(CC) $(SOLINK) -o $@ $< -L/usr/local/ssl/lib -lssl -lcrypto
-+	$(CC) $(SOLINK) -o $@ $< -lssl -lcrypto
- 
- app_voicemail.so : app_voicemail.o
- ifeq ($(USE_MYSQL_VM_INTERFACE),1)
--	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient -lz
-+	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L$(LOCALBASE)/lib/mysql -lmysqlclient -lz
- else
- ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
- 	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq
-@@ -88,7 +88,7 @@
- 	$(CC) $(SOLINK) -o $@ $< -lodbc
- 
- look:	look.c
--	gcc -pipe -O6 -g look.c -o look -lncurses
-+	$(CC) $(CFLAGS) look.c -o look -lncurses
- 
- ifneq ($(wildcard .depend),)
- include .depend
diff --git a/net/asterisk16/files/patch-apps::app_intercom.c b/net/asterisk16/files/patch-apps::app_intercom.c
deleted file mode 100644
index e4ac57f8e31b..000000000000
--- a/net/asterisk16/files/patch-apps::app_intercom.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- apps/app_intercom.c.orig	Wed Oct 22 06:10:24 2003
-+++ apps/app_intercom.c	Fri Jan 30 01:52:03 2004
-@@ -29,7 +29,7 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk16/files/patch-astman::Makefile b/net/asterisk16/files/patch-astman::Makefile
deleted file mode 100644
index cf31005257cf..000000000000
--- a/net/asterisk16/files/patch-astman::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- astman/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ astman/Makefile	Fri Jan 30 01:47:34 2004
-@@ -8,7 +8,7 @@
- install:
- 	if [ "$(TARGET)" != "none" ]; then \
- 		for x in $(TARGET); do \
--			install -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/astman; \
-+			$(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/astman; \
- 		done ; \
- 	fi
- 
diff --git a/net/asterisk16/files/patch-cdr::Makefile b/net/asterisk16/files/patch-cdr::Makefile
deleted file mode 100644
index 2ede608f9019..000000000000
--- a/net/asterisk16/files/patch-cdr::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- cdr/Makefile.orig	Sun Jan 11 21:17:02 2004
-+++ cdr/Makefile	Fri Jan 30 01:47:34 2004
-@@ -43,7 +43,7 @@
- all: depend $(MODS)
- 
- install: all
--	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- clean:
- 	rm -f *.so *.o .depend
diff --git a/net/asterisk16/files/patch-channels::Makefile b/net/asterisk16/files/patch-channels::Makefile
deleted file mode 100644
index d05ee2c13676..000000000000
--- a/net/asterisk16/files/patch-channels::Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-
-$FreeBSD$
-
---- channels/Makefile.orig	Fri Jan 23 22:57:48 2004
-+++ channels/Makefile	Thu Feb 19 01:48:41 2004
-@@ -26,12 +26,10 @@
- #
- #CHANNEL_LIBS+=chan_vofr
- 
--ifneq (${OSARCH},Darwin)
- CHANNEL_LIBS+=chan_oss.so
--endif
- 
- CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
--CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
-+CHANNEL_LIBS+=chan_h323.so
- 
- CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
- CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
-@@ -99,10 +97,8 @@
- 
- chan_oss.o: chan_oss.c  busy.h ringtone.h
- 
--ifeq (${OSARCH},OpenBSD)
- chan_oss.so: chan_oss.o
--	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
--endif
-+	$(CC) $(SOLINK) -o $@ chan_oss.o
- 
- chan_iax2.so: chan_iax2.o iax2-parser.o
- ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -146,15 +142,17 @@
- chan_vpb.so: chan_vpb.o
- 	 $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl
- 
--chan_h323.so: chan_h323.o h323/libchanh323.a
--	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+chan_h323.so: chan_h323.o h323/ast_h323.o
-+	$(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
- 
-+h323/ast_h323.o:
-+	$(MAKE) -C h323 ast_h323.o
- 
- #chan_modem.so : chan_modem.o
- #	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<
- 
- install: all
--	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk16/files/patch-channels::chan_h323.c b/net/asterisk16/files/patch-channels::chan_h323.c
deleted file mode 100644
index e413bd8ecec8..000000000000
--- a/net/asterisk16/files/patch-channels::chan_h323.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_h323.c.orig	Tue Jan 13 11:24:26 2004
-+++ channels/chan_h323.c	Fri Jan 30 01:47:34 2004
-@@ -54,6 +54,7 @@
- #include <fcntl.h>
- #include <netdb.h>
- #include <sys/signal.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- 
- 
diff --git a/net/asterisk16/files/patch-channels::chan_oss.c b/net/asterisk16/files/patch-channels::chan_oss.c
deleted file mode 100644
index 1006b377874e..000000000000
--- a/net/asterisk16/files/patch-channels::chan_oss.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_oss.c.orig	Wed Oct 22 06:10:34 2003
-+++ channels/chan_oss.c	Fri Jan 30 01:50:35 2004
-@@ -36,7 +36,7 @@
- #ifdef __linux
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk16/files/patch-channels::h323::Makefile b/net/asterisk16/files/patch-channels::h323::Makefile
deleted file mode 100644
index a9159b4441c1..000000000000
--- a/net/asterisk16/files/patch-channels::h323::Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-
-$FreeBSD$
-
---- channels/h323/Makefile.orig	Sun Jan 11 04:22:32 2004
-+++ channels/h323/Makefile	Fri Jan 30 01:47:34 2004
-@@ -19,7 +19,7 @@
- #
- # This needs to be updated to deal with more than just little endian machines
- #
--CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
-+CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
- 
- 
- #############################################
-@@ -27,38 +27,39 @@
- # Only change below if you know WTF your doing
- #
- CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
--CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
--CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
-+CFLAGS += -Wall -fPIC
-+CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
- CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
- CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
- CFLAGS += -I../../include
- CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
--CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
-+CFLAGS += -I$(OPENH323DIR)/include
- 
- 
- all:   	libchanh323.a
- 
- samples: 
--	if [ -f $(ASTETCDIR)/h323.conf ]; then \
--		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
-+	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
-+	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
-+		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
- 	fi ; 
--	install h323.conf.sample $(ASTETCDIR)/h323.conf
-  
- 
- ast_h323.o:	ast_h323.cpp
--	g++ -g -c -o $@ $(CFLAGS) $<
-+	$(CXX) -c -o $@ $(CFLAGS) $<
- 
- libchanh323.a:	ast_h323.o
- 	ar cr libchanh323.a ast_h323.o
- 
- chan_h323.so:	
--	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
- 
- chan_h323_d.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
- 
- chan_h323_s.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
-+
- clean:
- 	rm -f *.o *.so core.* libchanh323.a
- 
diff --git a/net/asterisk16/files/patch-codecs::Makefile b/net/asterisk16/files/patch-codecs::Makefile
deleted file mode 100644
index b802dc1233e8..000000000000
--- a/net/asterisk16/files/patch-codecs::Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-
-$FreeBSD$
-
---- codecs/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ codecs/Makefile	Fri Jan 30 01:47:34 2004
-@@ -17,23 +17,22 @@
- # g723.1b)
- #
- #MODG723=codec_g723_1.so codec_g723_1b.so
--MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
--MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
--MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
-+MODG723=codec_g723_1_dummy.so
-+MODG729=codec_g729_dummy.so
-+MODSPEEX=codec_speex.so
- MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
--CFLAGS+=-fPIC
--CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
-+CFLAGS+=-fPIC -I$(LOCALBASE)/include
- 
- LIBG723=g723.1/libg723.a
- LIBG723B=g723.1b/libg723b.a
- LIBGSM=gsm/lib/libgsm.a
- LIBGSMT=gsm/lib/libgsm.a
- LIBLPC10=lpc10/liblpc10.a
--LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib")
-+LIBSPEEX=-L$(LOCALBASE)/lib
- LIBSPEEX+=-lspeex -lm
- LIBILBC=ilbc/libilbc.a
- 
--CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-+CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so
- 
- all: depend $(CODECS)
-@@ -88,7 +87,7 @@
- include .depend
- 
- install: all
--	for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(CODECS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk16/files/patch-codecs::codec_g723_1_dummy.c b/net/asterisk16/files/patch-codecs::codec_g723_1_dummy.c
deleted file mode 100644
index 661ff2d88602..000000000000
--- a/net/asterisk16/files/patch-codecs::codec_g723_1_dummy.c
+++ /dev/null
@@ -1,314 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g723_1_dummy.c	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,308 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Translate between signed linear and G.723.1 (dummy!)
-+ *
-+ * The G.723.1 code is not included in the Asterisk distribution because
-+ * it is covered with patents, and in spite of statements to the contrary,
-+ * the "technology" is extremely expensive to license.
-+ * 
-+ * Copyright (C) 1999, Mark Spencer
-+ *
-+ * Mark Spencer <markster@linux-support.net>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#define TYPE_HIGH	 0x0
-+#define TYPE_LOW	 0x1
-+#define TYPE_SILENCE	 0x2
-+#define TYPE_DONTSEND	 0x3
-+#define TYPE_MASK	 0x3
-+
-+#include <sys/types.h>
-+#include <asterisk/translate.h>
-+#include <asterisk/module.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/channel.h>
-+#include <pthread.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <netinet/in.h>
-+#include <string.h>
-+#include <stdio.h>
-+
-+/* Sample frame data */
-+#include "slin_g723_ex.h"
-+#include "g723_slin_ex.h"
-+
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
-+static int localusecnt=0;
-+
-+static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator";
-+
-+struct g723_encoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Buffer for our outgoing frame */
-+	char outbuf[8000];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+struct g723_decoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+static struct ast_translator_pvt *g723tolin_new()
-+{
-+	struct g723_decoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g723_decoder_pvt));
-+	if (tmp) {
-+		tmp->tail = 0;
-+		localusecnt++;
-+		ast_update_use_count();
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *lintog723_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_SLINEAR;
-+	f.datalen = sizeof(slin_g723_ex);
-+	/* Assume 8000 Hz */
-+	f.samples = sizeof(slin_g723_ex)/16;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = slin_g723_ex;
-+	return &f;
-+}
-+
-+static struct ast_frame *g723tolin_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_G723_1;
-+	f.datalen = sizeof(g723_slin_ex);
-+	/* All frames are 30 ms long */
-+	f.samples = 30;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = g723_slin_ex;
-+	return &f;
-+}
-+
-+static struct ast_translator_pvt *lintog723_new()
-+{
-+	struct g723_encoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g723_encoder_pvt));
-+	if (tmp) {
-+		localusecnt++;
-+		ast_update_use_count();
-+		tmp->tail = 0;
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *g723tolin_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt;
-+	if (!tmp->tail)
-+		return NULL;
-+	/* Signed linear is no particular frame size, so just send whatever
-+	   we have in the buffer in one lump sum */
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_SLINEAR;
-+	tmp->f.datalen = tmp->tail * 2;
-+	/* Assume 8000 Hz */
-+	tmp->f.samples = tmp->tail / 8;
-+	tmp->f.mallocd = 0;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.data = tmp->buf;
-+	/* Reset tail pointer */
-+	tmp->tail = 0;
-+
-+	return &tmp->f;	
-+}
-+
-+static int g723_len(unsigned char buf)
-+{
-+	switch(buf & TYPE_MASK) {
-+	case TYPE_DONTSEND:
-+		return 2;
-+		break;
-+	case TYPE_SILENCE:
-+		return 4;
-+		break;
-+	case TYPE_HIGH:
-+		return 24;
-+		break;
-+	case TYPE_LOW:
-+		return 20;
-+		break;
-+	default:
-+		ast_log(LOG_WARNING, "Badly encoded frame (%d)\n", buf & TYPE_MASK);
-+	}
-+	return -1;
-+}
-+
-+static int g723tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt;
-+	int len = 0;
-+	int res;
-+	while(len < f->datalen) {
-+		/* Assuming there's space left, decode into the current buffer at
-+		   the tail location */
-+		res = g723_len(((unsigned char *)f->data + len)[0]);
-+		if (res < 0) {
-+			ast_log(LOG_WARNING, "Invalid data\n");
-+			return -1;
-+		}
-+		if (res + len > f->datalen) {
-+			ast_log(LOG_WARNING, "Measured length exceeds frame length\n");
-+			return -1;
-+		}
-+		if (tmp->tail + 480 < sizeof(tmp->buf)/2) {	
-+			memset(tmp->buf + tmp->tail, 0, 480);
-+			tmp->tail+=480;
-+		} else {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return -1;
-+		}
-+		len += res;
-+	}
-+	return 0;
-+}
-+
-+static int lintog723_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	/* Just add the frames to our stream */
-+	/* XXX We should look at how old the rest of our stream is, and if it
-+	   is too old, then we should overwrite it entirely, otherwise we can
-+	   get artifacts of earlier talk that do not belong */
-+	struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt;
-+	if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) {
-+		memcpy(&tmp->buf[tmp->tail], f->data, f->datalen);
-+		tmp->tail += f->datalen/2;
-+	} else {
-+		ast_log(LOG_WARNING, "Out of buffer space\n");
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static struct ast_frame *lintog723_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt;
-+	int cnt=0;
-+	/* We can't work on anything less than a frame in size */
-+	if (tmp->tail < 480)
-+		return NULL;
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_G723_1;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.samples = 0;
-+	tmp->f.mallocd = 0;
-+	while(tmp->tail >= 480) {
-+		/* Encode a frame of data */
-+		if (cnt + 24 >= sizeof(tmp->outbuf)) {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return NULL;
-+		}
-+		memset(tmp->outbuf + cnt, 0, 24);
-+		/* Assume 8000 Hz */
-+		tmp->f.samples += 30;
-+		cnt += 24;
-+		tmp->tail -= 480;
-+		/* Move the data at the end of the buffer to the front */
-+		if (tmp->tail)
-+			memmove(tmp->buf, tmp->buf + 480, tmp->tail * 2);
-+	}
-+	tmp->f.datalen = cnt;
-+	tmp->f.data = tmp->outbuf;
-+	return &tmp->f;	
-+}
-+
-+static void g723_destroy(struct ast_translator_pvt *pvt)
-+{
-+	free(pvt);
-+	localusecnt--;
-+	ast_update_use_count();
-+}
-+
-+static struct ast_translator g723tolin =
-+	{ "g723tolin_dummy", 
-+	   AST_FORMAT_G723_1, AST_FORMAT_SLINEAR,
-+	   g723tolin_new,
-+	   g723tolin_framein,
-+	   g723tolin_frameout,
-+	   g723_destroy,
-+	   g723tolin_sample
-+	   };
-+
-+static struct ast_translator lintog723 =
-+	{ "lintog723_dummy", 
-+	   AST_FORMAT_SLINEAR, AST_FORMAT_G723_1,
-+	   lintog723_new,
-+	   lintog723_framein,
-+	   lintog723_frameout,
-+	   g723_destroy,
-+	   lintog723_sample
-+	   };
-+
-+int unload_module(void)
-+{
-+	int res;
-+	ast_mutex_lock(&localuser_lock);
-+	res = ast_unregister_translator(&lintog723);
-+	if (!res)
-+		res = ast_unregister_translator(&g723tolin);
-+	if (localusecnt)
-+		res = -1;
-+	ast_mutex_unlock(&localuser_lock);
-+	return res;
-+}
-+
-+int load_module(void)
-+{
-+	int res;
-+	res=ast_register_translator(&g723tolin);
-+	if (!res) 
-+		res=ast_register_translator(&lintog723);
-+	else
-+		ast_unregister_translator(&g723tolin);
-+	return res;
-+}
-+
-+char *description(void)
-+{
-+	return tdesc;
-+}
-+
-+int usecount(void)
-+{
-+	int res;
-+	STANDARD_USECOUNT(res);
-+	return res;
-+}
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk16/files/patch-codecs::codec_g729_dummy.c b/net/asterisk16/files/patch-codecs::codec_g729_dummy.c
deleted file mode 100644
index c3e27d98e27e..000000000000
--- a/net/asterisk16/files/patch-codecs::codec_g729_dummy.c
+++ /dev/null
@@ -1,281 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g729_dummy.c	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,275 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Translate between signed linear and G.729 (dummy!)
-+ *
-+ * The G.729 code is not included in the Asterisk distribution because
-+ * it is covered with patents, and in spite of statements to the contrary,
-+ * the "technology" is extremely expensive to license.
-+ * 
-+ * Copyright (C) 1999, Mark Spencer
-+ *
-+ * Mark Spencer <markster@linux-support.net>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#include <sys/types.h>
-+#include <asterisk/translate.h>
-+#include <asterisk/module.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/channel.h>
-+#include <pthread.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <netinet/in.h>
-+#include <string.h>
-+#include <stdio.h>
-+
-+/* Sample frame data */
-+#include "slin_g729_ex.h"
-+#include "g729_slin_ex.h"
-+
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
-+static int localusecnt=0;
-+
-+static char *tdesc = "Dummy G.729/PCM16 Codec Translator";
-+
-+struct g729_encoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Buffer for our outgoing frame */
-+	char outbuf[8000];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+struct g729_decoder_pvt {
-+	struct ast_frame f;
-+	/* Space to build offset */
-+	char offset[AST_FRIENDLY_OFFSET];
-+	/* Enough to store a full second */
-+	short buf[8000];
-+	int tail;
-+};
-+
-+static struct ast_translator_pvt *g729tolin_new()
-+{
-+	struct g729_decoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g729_decoder_pvt));
-+	if (tmp) {
-+		tmp->tail = 0;
-+		localusecnt++;
-+		ast_update_use_count();
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *lintog729_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_SLINEAR;
-+	f.datalen = sizeof(slin_g729_ex);
-+	/* Assume 8000 Hz */
-+	f.samples = sizeof(slin_g729_ex)/16;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = slin_g729_ex;
-+	return &f;
-+}
-+
-+static struct ast_frame *g729tolin_sample()
-+{
-+	static struct ast_frame f;
-+	f.frametype = AST_FRAME_VOICE;
-+	f.subclass = AST_FORMAT_G729A;
-+	f.datalen = sizeof(g729_slin_ex);
-+	/* All frames are 10 ms long */
-+	f.samples = 10;
-+	f.mallocd = 0;
-+	f.offset = 0;
-+	f.src = __PRETTY_FUNCTION__;
-+	f.data = g729_slin_ex;
-+	return &f;
-+}
-+
-+static struct ast_translator_pvt *lintog729_new()
-+{
-+	struct g729_encoder_pvt *tmp;
-+	tmp = malloc(sizeof(struct g729_encoder_pvt));
-+	if (tmp) {
-+		localusecnt++;
-+		ast_update_use_count();
-+		tmp->tail = 0;
-+	}
-+	return (struct ast_translator_pvt *)tmp;
-+}
-+
-+static struct ast_frame *g729tolin_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt;
-+	if (!tmp->tail)
-+		return NULL;
-+	/* Signed linear is no particular frame size, so just send whatever
-+	   we have in the buffer in one lump sum */
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_SLINEAR;
-+	tmp->f.datalen = tmp->tail * 2;
-+	/* Assume 8000 Hz */
-+	tmp->f.samples = tmp->tail / 8;
-+	tmp->f.mallocd = 0;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.data = tmp->buf;
-+	/* Reset tail pointer */
-+	tmp->tail = 0;
-+
-+	return &tmp->f;	
-+}
-+
-+static int g729tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt;
-+	int len = 0;
-+	while(len < f->datalen) {
-+		/* Assuming there's space left, decode into the current buffer at
-+		   the tail location */
-+		if (10 + len > f->datalen) {
-+			ast_log(LOG_WARNING, "Measured length exceeds frame length\n");
-+			return -1;
-+		}
-+		if (tmp->tail + 160 < sizeof(tmp->buf)/2) {	
-+			memset(tmp->buf + tmp->tail, 0, 160);
-+			tmp->tail+=160;
-+		} else {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return -1;
-+		}
-+		len += 10;
-+	}
-+	return 0;
-+}
-+
-+static int lintog729_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
-+{
-+	/* Just add the frames to our stream */
-+	/* XXX We should look at how old the rest of our stream is, and if it
-+	   is too old, then we should overwrite it entirely, otherwise we can
-+	   get artifacts of earlier talk that do not belong */
-+	struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt;
-+	if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) {
-+		memcpy(&tmp->buf[tmp->tail], f->data, f->datalen);
-+		tmp->tail += f->datalen/2;
-+	} else {
-+		ast_log(LOG_WARNING, "Out of buffer space\n");
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static struct ast_frame *lintog729_frameout(struct ast_translator_pvt *pvt)
-+{
-+	struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt;
-+	int cnt=0;
-+	/* We can't work on anything less than a frame in size */
-+	if (tmp->tail < 160)
-+		return NULL;
-+	tmp->f.frametype = AST_FRAME_VOICE;
-+	tmp->f.subclass = AST_FORMAT_G729A;
-+	tmp->f.offset = AST_FRIENDLY_OFFSET;
-+	tmp->f.src = __PRETTY_FUNCTION__;
-+	tmp->f.samples = 0;
-+	tmp->f.mallocd = 0;
-+	while(tmp->tail >= 160) {
-+		/* Encode a frame of data */
-+		if (cnt + 10 >= sizeof(tmp->outbuf)) {
-+			ast_log(LOG_WARNING, "Out of buffer space\n");
-+			return NULL;
-+		}
-+		memset(tmp->outbuf + cnt, 0, 10);
-+		/* Assume 8000 Hz */
-+		tmp->f.samples += 10;
-+		cnt += 10;
-+		tmp->tail -= 160;
-+		/* Move the data at the end of the buffer to the front */
-+		if (tmp->tail)
-+			memmove(tmp->buf, tmp->buf + 160, tmp->tail * 2);
-+	}
-+	tmp->f.datalen = cnt;
-+	tmp->f.data = tmp->outbuf;
-+	return &tmp->f;	
-+}
-+
-+static void g729_destroy(struct ast_translator_pvt *pvt)
-+{
-+	free(pvt);
-+	localusecnt--;
-+	ast_update_use_count();
-+}
-+
-+static struct ast_translator g729tolin =
-+	{ "g729tolin_dummy", 
-+	   AST_FORMAT_G729A, AST_FORMAT_SLINEAR,
-+	   g729tolin_new,
-+	   g729tolin_framein,
-+	   g729tolin_frameout,
-+	   g729_destroy,
-+	   g729tolin_sample
-+	   };
-+
-+static struct ast_translator lintog729 =
-+	{ "lintog729_dummy", 
-+	   AST_FORMAT_SLINEAR, AST_FORMAT_G729A,
-+	   lintog729_new,
-+	   lintog729_framein,
-+	   lintog729_frameout,
-+	   g729_destroy,
-+	   lintog729_sample
-+	   };
-+
-+int unload_module(void)
-+{
-+	int res;
-+	ast_mutex_lock(&localuser_lock);
-+	res = ast_unregister_translator(&lintog729);
-+	if (!res)
-+		res = ast_unregister_translator(&g729tolin);
-+	if (localusecnt)
-+		res = -1;
-+	ast_mutex_unlock(&localuser_lock);
-+	return res;
-+}
-+
-+int load_module(void)
-+{
-+	int res;
-+	res=ast_register_translator(&g729tolin);
-+	if (!res) 
-+		res=ast_register_translator(&lintog729);
-+	else
-+		ast_unregister_translator(&g729tolin);
-+	return res;
-+}
-+
-+char *description(void)
-+{
-+	return tdesc;
-+}
-+
-+int usecount(void)
-+{
-+	int res;
-+	STANDARD_USECOUNT(res);
-+	return res;
-+}
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk16/files/patch-codecs::g729_slin_ex.h b/net/asterisk16/files/patch-codecs::g729_slin_ex.h
deleted file mode 100644
index 44e60f2de848..000000000000
--- a/net/asterisk16/files/patch-codecs::g729_slin_ex.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/g729_slin_ex.h	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,14 @@
-+/*
-+ * g729_slin_ex.h --
-+ *
-+ *      8-bit G.729 data, 10 milliseconds worth at 8 kHz.
-+ *
-+ * Copyright (C) 2004, Maxim Sobolev <sobomax@FreeBSD.org>
-+ *
-+ * Distributed under the terms of the GNU General Public License
-+ *
-+ */
-+
-+static unsigned char g729_slin_ex[] = {
-+120,82,175,64,0,250,219,0,7,214
-+};
diff --git a/net/asterisk16/files/patch-codecs::gsm::Makefile b/net/asterisk16/files/patch-codecs::gsm::Makefile
deleted file mode 100644
index d60ed11f3298..000000000000
--- a/net/asterisk16/files/patch-codecs::gsm::Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- codecs/gsm/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/gsm/Makefile	Fri Jan 30 01:47:34 2004
-@@ -60,8 +60,8 @@
- # CC		= /usr/lang/acc
- # CCFLAGS 	= -c -O
- 
--CC		= gcc $(OPTIMIZE) -fomit-frame-pointer 
--CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
-+CC		?= gcc
-+CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer
- 
- LD 		= $(CC)
- 
-@@ -146,7 +146,7 @@
- DEBUG	= -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
- 
--CFLAGS	= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
-+CFLAGS	+= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
- 	$(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC)
- ######### It's $(CC) $(CFLAGS)
- 
diff --git a/net/asterisk16/files/patch-codecs::ilbc::Makefile b/net/asterisk16/files/patch-codecs::ilbc::Makefile
deleted file mode 100644
index 7770e07550a4..000000000000
--- a/net/asterisk16/files/patch-codecs::ilbc::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-
-$FreeBSD$
-
---- codecs/ilbc/Makefile.orig	Sun Apr 27 21:13:11 2003
-+++ codecs/ilbc/Makefile	Fri Jan 30 01:47:34 2004
-@@ -1,4 +1,4 @@
--CFLAGS+= -fPIC -O3
-+CFLAGS+= -fPIC
- LIB=libilbc.a
- 
- OBJS= anaFilter.o iCBSearch.o packing.o \
diff --git a/net/asterisk16/files/patch-codecs::lpc10::Makefile b/net/asterisk16/files/patch-codecs::lpc10::Makefile
deleted file mode 100644
index 68c98c064f70..000000000000
--- a/net/asterisk16/files/patch-codecs::lpc10::Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD$
-
---- codecs/lpc10/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/lpc10/Makefile	Fri Jan 30 02:06:54 2004
-@@ -3,7 +3,7 @@
- # 
- 
- # default C compiler
--CC= gcc
-+CC?= gcc
- 
- # 
- # These definitions for CFLAGS and LIB_TARGET_DIR are used when one
-@@ -22,14 +22,14 @@
- # 
- 
- WARNINGS = -Wall -Wno-comment -Wno-error
--CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
-+CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
- #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
- 
- #fix for PPC processors
- ifneq ($(OSARCH),Darwin)
- ifneq ($(PROC),ppc)
- ifneq ($(PROC),x86_64)
--	CFLAGS+= -march=$(PROC)
-+	CFLAGS+= 
- endif
- endif
- endif
diff --git a/net/asterisk16/files/patch-codecs::slin_g729_ex.h b/net/asterisk16/files/patch-codecs::slin_g729_ex.h
deleted file mode 100644
index e1236d2498dc..000000000000
--- a/net/asterisk16/files/patch-codecs::slin_g729_ex.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/slin_g729_ex.h	Fri Jan 30 01:57:59 2004
-@@ -0,0 +1,25 @@
-+/*
-+ * slin_g729_ex.h --
-+ *
-+ *	Signed 16-bit audio data, 10 milliseconds worth at 8 kHz.
-+ *
-+ * Source: g723.example
-+ *
-+ * Copyright (C) 2001, Linux Support Services, Inc.
-+ *
-+ * Distributed under the terms of the GNU General Public License
-+ *
-+ */
-+
-+static signed short slin_g729_ex[] = {
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
-+};
diff --git a/net/asterisk16/files/patch-db.c b/net/asterisk16/files/patch-db.c
deleted file mode 100644
index 59e5cef87770..000000000000
--- a/net/asterisk16/files/patch-db.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- db.c.orig	Tue Dec  2 17:12:56 2003
-+++ db.c	Fri Jan 30 01:47:34 2004
-@@ -32,7 +32,7 @@
- #include <asterisk/options.h>
- #include <asterisk/astdb.h>
- #include <asterisk/cli.h>
--#include "db1-ast/include/db.h"
-+#include <db.h>
- #include "asterisk.h"
- #include "astconf.h"
- 
diff --git a/net/asterisk16/files/patch-editline::configure b/net/asterisk16/files/patch-editline::configure
deleted file mode 100644
index f6b9c5b76eee..000000000000
--- a/net/asterisk16/files/patch-editline::configure
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- editline/configure.orig	Sun Apr 27 21:13:11 2003
-+++ editline/configure	Fri Jan 30 01:47:34 2004
-@@ -1906,7 +1906,7 @@
-   CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG"
-   CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE"
- else
--  CFLAGS="$CFLAGS -O"
-+  CFLAGS="$CFLAGS"
- fi
- 
- 
diff --git a/net/asterisk16/files/patch-formats::Makefile b/net/asterisk16/files/patch-formats::Makefile
deleted file mode 100644
index dacfd7b08303..000000000000
--- a/net/asterisk16/files/patch-formats::Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- formats/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ formats/Makefile	Fri Jan 30 01:47:34 2004
-@@ -18,7 +18,7 @@
- #
- # G723 simple frame is depricated
- #
--#FORMAT_LIBS+=format_g723.so
-+FORMAT_LIBS+=format_g723_1.so
- 
- GSMLIB=../codecs/gsm/lib/libgsm.a
- 
-@@ -40,7 +40,7 @@
- 	$(CC) $(SOLINK) -o $@ $< -lm
- 
- install: all
--	for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(FORMAT_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk16/files/patch-formats::format_g723_1.c b/net/asterisk16/files/patch-formats::format_g723_1.c
deleted file mode 100644
index 8d0755e14205..000000000000
--- a/net/asterisk16/files/patch-formats::format_g723_1.c
+++ /dev/null
@@ -1,351 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ formats/format_g723_1.c	Fri Jan 30 01:58:19 2004
-@@ -0,0 +1,345 @@
-+/*
-+ * Asterisk -- A telephony toolkit for Linux.
-+ *
-+ * Save and read raw, headerless G723.1 Annex A data.
-+ *
-+ * Copyright (C) 1999, Mark Spencer <markster@linux-support.net>
-+ * Copyright (C) 2003, Maxim Sobolev <sobomax@FreeBSD.org>
-+ *
-+ * This program is free software, distributed under the terms of
-+ * the GNU General Public License
-+ */
-+
-+#include <asterisk/lock.h>
-+#include <asterisk/channel.h>
-+#include <asterisk/file.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/sched.h>
-+#include <asterisk/module.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <stdlib.h>
-+#include <sys/time.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#include <string.h>
-+#include <pthread.h>
-+#ifdef __linux__
-+#include <endian.h>
-+#else
-+#include <machine/endian.h>
-+#endif
-+
-+/* Based on format_g729.c */
-+
-+#define TYPE_HIGH	0x0
-+#define TYPE_LOW	0x1
-+#define TYPE_SILENCE	0x2
-+#define TYPE_DONTSEND	0x3
-+#define TYPE_MASK	0x3
-+
-+struct ast_filestream {
-+	void *reserved[AST_RESERVED_POINTERS];
-+	/* This is what a filestream means to us */
-+	int fd; 				/* Descriptor */
-+	struct ast_frame fr;			/* Frame information */
-+	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
-+	char empty;				/* Empty character */
-+	unsigned char g723[24];			/* One Real G723.1 Frame */
-+};
-+
-+static long g723_tell(struct ast_filestream *);
-+
-+static ast_mutex_t g723_lock = AST_MUTEX_INITIALIZER;
-+static int glistcnt = 0;
-+
-+static char *name = "g723";
-+static char *desc = "Raw G723.1 Annex A data";
-+static char *exts = "g723";
-+
-+static int g723_len(unsigned char buf)
-+{
-+	switch(buf & TYPE_MASK) {
-+	case TYPE_DONTSEND:
-+		return 2;
-+		break;
-+	case TYPE_SILENCE:
-+		return 4;
-+		break;
-+	case TYPE_HIGH:
-+		return 24;
-+		break;
-+	case TYPE_LOW:
-+		return 20;
-+		break;
-+	default:
-+		ast_log(LOG_WARNING, "Badly encoded G723.1 frame (%d)\n", buf & TYPE_MASK);
-+	}
-+	return -1;
-+}
-+
-+static struct ast_filestream *g723_open(int fd)
-+{
-+	/* We don't have any header to read or anything really, but
-+	   if we did, it would go here.  We also might want to check
-+	   and be sure it's a valid file.  */
-+	struct ast_filestream *tmp;
-+	if ((tmp = malloc(sizeof(struct ast_filestream)))) {
-+		memset(tmp, 0, sizeof(struct ast_filestream));
-+		if (ast_mutex_lock(&g723_lock)) {
-+			ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+			free(tmp);
-+			return NULL;
-+		}
-+		tmp->fd = fd;
-+		tmp->fr.data = tmp->g723;
-+		tmp->fr.frametype = AST_FRAME_VOICE;
-+		tmp->fr.subclass = AST_FORMAT_G723_1;
-+		/* datalen will vary for each frame */
-+		tmp->fr.src = name;
-+		tmp->fr.mallocd = 0;
-+		glistcnt++;
-+		ast_mutex_unlock(&g723_lock);
-+		ast_update_use_count();
-+	}
-+	return tmp;
-+}
-+
-+static struct ast_filestream *g723_rewrite(int fd, char *comment)
-+{
-+	/* We don't have any header to read or anything really, but
-+	   if we did, it would go here.  We also might want to check
-+	   and be sure it's a valid file.  */
-+	struct ast_filestream *tmp;
-+	if ((tmp = malloc(sizeof(struct ast_filestream)))) {
-+		memset(tmp, 0, sizeof(struct ast_filestream));
-+		if (ast_mutex_lock(&g723_lock)) {
-+			ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+			free(tmp);
-+			return NULL;
-+		}
-+		tmp->fd = fd;
-+		glistcnt++;
-+		ast_mutex_unlock(&g723_lock);
-+		ast_update_use_count();
-+	} else
-+		ast_log(LOG_WARNING, "Out of memory\n");
-+	return tmp;
-+}
-+
-+static void g723_close(struct ast_filestream *s)
-+{
-+	if (ast_mutex_lock(&g723_lock)) {
-+		ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+		return;
-+	}
-+	glistcnt--;
-+	ast_mutex_unlock(&g723_lock);
-+	ast_update_use_count();
-+	close(s->fd);
-+	free(s);
-+	s = NULL;
-+}
-+
-+static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext)
-+{
-+	int res;
-+	/* Send a frame from the file to the appropriate channel */
-+	s->fr.frametype = AST_FRAME_VOICE;
-+	s->fr.subclass = AST_FORMAT_G723_1;
-+	s->fr.offset = AST_FRIENDLY_OFFSET;
-+	s->fr.samples = 240;
-+	s->fr.mallocd = 0;
-+	s->fr.data = s->g723;
-+	if ((res = read(s->fd, s->g723, 1)) != 1) {
-+		if (res)
-+			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
-+		return NULL;
-+	}
-+	s->fr.datalen = g723_len(s->g723[0]);
-+	if (s->fr.datalen < 0) {
-+		ast_log(LOG_WARNING, "Invalid G723.1 frame!\n");
-+		return NULL;
-+	}
-+	if (s->fr.datalen > 1 && (res = read(s->fd, s->g723 + 1, s->fr.datalen - 1)) != s->fr.datalen - 1) {
-+		if (res)
-+			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
-+		return NULL;
-+	}
-+	*whennext = s->fr.samples;
-+	return &s->fr;
-+}
-+
-+static int g723_write(struct ast_filestream *fs, struct ast_frame *f)
-+{
-+	int res;
-+	unsigned char *cp;
-+	if (f->frametype != AST_FRAME_VOICE) {
-+		ast_log(LOG_WARNING, "Asked to write non-voice frame!\n");
-+		return -1;
-+	}
-+	if (f->subclass != AST_FORMAT_G723_1) {
-+		ast_log(LOG_WARNING, "Asked to write non-G723.1 frame (%d)!\n", f->subclass);
-+		return -1;
-+	}
-+	for (cp = f->data; cp < (unsigned char *)f->data + f->datalen; cp += res) {
-+		res = g723_len(cp[0]);
-+		if (res < 0) {
-+			ast_log(LOG_WARNING, "Asked to write invalid G723.1 frame!\n");
-+			return -1;
-+		}
-+	}
-+	if (cp != (unsigned char *)f->data + f->datalen) {
-+		ast_log(LOG_WARNING, "Invalid G723.1 data length, %d\n", f->datalen);
-+		return -1;
-+	}
-+	if ((res = write(fs->fd, f->data, f->datalen)) != f->datalen) {
-+		ast_log(LOG_WARNING, "Bad write %d: %s\n", res, strerror(errno));
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static char *g723_getcomment(struct ast_filestream *s)
-+{
-+	return NULL;
-+}
-+
-+static int g723_seek(struct ast_filestream *fs, long sample_offset, int whence)
-+{
-+	long cur, offset, max;
-+	off_t coffset, moffset, soffset;
-+	int res;
-+	unsigned char c;
-+
-+	offset = 0;	/* Shut up gcc warning */
-+	if (whence == SEEK_SET) {
-+		offset = sample_offset;
-+	} else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) {
-+		if ((cur = g723_tell(fs)) == -1) {
-+			ast_log(LOG_WARNING, "Can't get current position!\n");
-+			return -1;
-+		}
-+		offset = cur + sample_offset;
-+	}
-+	if ((moffset = lseek(fs->fd, 0, SEEK_END)) == -1) {
-+		ast_log(LOG_WARNING, "Can't seek stream to an end!\n");
-+		return -1;
-+	}
-+	if (whence == SEEK_END) {
-+		if ((max = g723_tell(fs)) == -1) {
-+			ast_log(LOG_WARNING, "Can't get maximum position!\n");
-+			return -1;
-+		}
-+		offset = max - sample_offset;
-+	}
-+	if (offset < 0)
-+		offset = 0;
-+	soffset = -1;
-+	for (coffset = 0; coffset < moffset && offset > 0; coffset += res) {
-+		if (lseek(fs->fd, coffset, SEEK_SET) != coffset) {
-+			ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		if (read(fs->fd, &c, 1) != 1) {
-+			ast_log(LOG_WARNING, "Can't read from offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		soffset = coffset;
-+		if ((res = g723_len(c)) < 0) {
-+			ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %lli!\n", coffset);
-+			return -1;
-+		}
-+		if (res > 1)
-+			offset -= 240;
-+	}
-+	if (soffset != -1 && lseek(fs->fd, soffset, SEEK_SET) != soffset) {
-+		ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", soffset);
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+static int g723_trunc(struct ast_filestream *fs)
-+{
-+	/* Truncate file to current length */
-+	if (ftruncate(fs->fd, lseek(fs->fd, 0, SEEK_CUR)) < 0)
-+		return -1;
-+	return 0;
-+}
-+
-+static long g723_tell(struct ast_filestream *fs)
-+{
-+	off_t offset, coffset;
-+	int res;
-+	long rval;
-+	unsigned char c;
-+
-+	offset = lseek(fs->fd, 0, SEEK_CUR);
-+	rval = 0;
-+	for (coffset = 0; coffset < offset; coffset += res) {
-+		if (lseek(fs->fd, coffset, SEEK_SET) != coffset) {
-+			ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if (read(fs->fd, &c, 1) != 1) {
-+			ast_log(LOG_WARNING, "Can't read from offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if ((res = g723_len(c)) < 0) {
-+			ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %llu!\n", coffset);
-+			return -1;
-+		}
-+		if (res > 1)
-+			rval += 240;
-+	}
-+	if (lseek(fs->fd, offset, SEEK_SET) != offset) {
-+		ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", offset);
-+		return -1;
-+	}
-+	return rval;
-+}
-+
-+int load_module()
-+{
-+	return ast_format_register(name, exts, AST_FORMAT_G723_1,
-+				   g723_open,
-+				   g723_rewrite,
-+				   g723_write,
-+				   g723_seek,
-+				   g723_trunc,
-+				   g723_tell,
-+				   g723_read,
-+				   g723_close,
-+				   g723_getcomment);
-+}
-+
-+int unload_module()
-+{
-+	return ast_format_unregister(name);
-+}
-+
-+int usecount()
-+{
-+	int res;
-+	if (ast_mutex_lock(&g723_lock)) {
-+		ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-+		return -1;
-+	}
-+	res = glistcnt;
-+	ast_mutex_unlock(&g723_lock);
-+	return res;
-+}
-+
-+char *description()
-+{
-+	return desc;
-+}
-+
-+
-+char *key()
-+{
-+	return ASTERISK_GPL_KEY;
-+}
diff --git a/net/asterisk16/files/patch-formats::format_g729.c b/net/asterisk16/files/patch-formats::format_g729.c
deleted file mode 100644
index a144d1b0f6bf..000000000000
--- a/net/asterisk16/files/patch-formats::format_g729.c
+++ /dev/null
@@ -1,47 +0,0 @@
-
-$FreeBSD$
-
---- formats/format_g729.c.orig	Wed Jan 28 23:32:48 2004
-+++ formats/format_g729.c	Thu Feb 19 01:03:30 2004
-@@ -45,7 +45,7 @@
- 	struct ast_frame fr;				/* Frame information */
- 	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
- 	char empty;							/* Empty character */
--	unsigned char g729[20];				/* Two Real G729 Frames */
-+	unsigned char g729[10];				/* One Real G729 Frame */
- };
- 
- 
-@@ -126,11 +126,11 @@
- 	s->fr.frametype = AST_FRAME_VOICE;
- 	s->fr.subclass = AST_FORMAT_G729A;
- 	s->fr.offset = AST_FRIENDLY_OFFSET;
--	s->fr.samples = 160;
--	s->fr.datalen = 20;
-+	s->fr.samples = 80;
-+	s->fr.datalen = 10;
- 	s->fr.mallocd = 0;
- 	s->fr.data = s->g729;
--	if ((res = read(s->fd, s->g729, 20)) != 20) {
-+	if ((res = read(s->fd, s->g729, 10)) != 10) {
- 		if (res)
- 			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
- 		return NULL;
-@@ -174,7 +174,7 @@
- 	cur = lseek(fs->fd, 0, SEEK_CUR);
- 	max = lseek(fs->fd, 0, SEEK_END);
- 	
--	bytes = 20 * (sample_offset / 160);
-+	bytes = 10 * (sample_offset / 80);
- 	if (whence == SEEK_SET)
- 		offset = bytes;
- 	else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
-@@ -202,7 +202,7 @@
- {
- 	off_t offset;
- 	offset = lseek(fs->fd, 0, SEEK_CUR);
--	return (offset/20)*160;
-+	return (offset/10)*80;
- }
- 
- int load_module()
diff --git a/net/asterisk16/files/patch-pbx::Makefile b/net/asterisk16/files/patch-pbx::Makefile
deleted file mode 100644
index dca6672c389a..000000000000
--- a/net/asterisk16/files/patch-pbx::Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- pbx/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ pbx/Makefile	Fri Jan 30 01:47:34 2004
-@@ -16,7 +16,7 @@
- PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so     # pbx_gtkconsole.so pbx_kdeconsole.so
- 
- # Add GTK console if appropriate
--PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
-+#PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
- # Add KDE Console if appropriate
- #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so")
- 
-@@ -62,7 +62,7 @@
- endif
- 
- install: all
--	for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(PBX_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- depend: .depend
- 
diff --git a/net/asterisk16/files/patch-res::Makefile b/net/asterisk16/files/patch-res::Makefile
deleted file mode 100644
index ccd0a35dd59d..000000000000
--- a/net/asterisk16/files/patch-res::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- res/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ res/Makefile	Fri Jan 30 01:47:34 2004
-@@ -25,7 +25,7 @@
- all: depend $(MODS)
- 
- install: all
--	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-+	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- res_crypto.so: res_crypto.o
- 	$(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS)
diff --git a/net/asterisk16/pkg-descr b/net/asterisk16/pkg-descr
deleted file mode 100644
index 28b7a1deb011..000000000000
--- a/net/asterisk16/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
-sense, middleware between Internet and telephony channels on the bottom,
-and Internet and telephony applications at the top.
-
-WWW: http://www.asteriskpbx.com
diff --git a/net/asterisk16/pkg-plist b/net/asterisk16/pkg-plist
deleted file mode 100644
index ab3eff23ff6e..000000000000
--- a/net/asterisk16/pkg-plist
+++ /dev/null
@@ -1,462 +0,0 @@
-@unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi
-etc/asterisk/adsi.conf-dist
-@exec [ -f %B/adsi.conf ] || cp %B/%f %B/adsi.conf
-@unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi
-etc/asterisk/adtranvofr.conf-dist
-@exec [ -f %B/adtranvofr.conf ] || cp %B/%f %B/adtranvofr.conf
-@unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi
-etc/asterisk/agents.conf-dist
-@exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf
-@unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi
-etc/asterisk/alsa.conf-dist
-@exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf
-@unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi
-etc/asterisk/asterisk.adsi-dist
-@exec [ -f %B/asterisk.adsi ] || cp %B/%f %B/asterisk.adsi
-@unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi
-etc/asterisk/asterisk.conf-dist
-@exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf
-@unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi
-etc/asterisk/cdr_odbc.conf-dist
-@exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf
-@unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi
-etc/asterisk/cdr_pgsql.conf-dist
-@exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf
-@unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi
-etc/asterisk/enum.conf-dist
-@exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf
-@unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi
-etc/asterisk/extensions.conf-dist
-@exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf
-@unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
-etc/asterisk/festival.conf-dist
-@exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
-@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
-etc/asterisk/h323.conf-dist
-@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.conf
-@unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
-etc/asterisk/iax.conf-dist
-@exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
-@unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi
-etc/asterisk/indications.conf-dist
-@exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf
-@unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi
-etc/asterisk/logger.conf-dist
-@exec [ -f %B/logger.conf ] || cp %B/%f %B/logger.conf
-@unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi
-etc/asterisk/manager.conf-dist
-@exec [ -f %B/manager.conf ] || cp %B/%f %B/manager.conf
-@unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi
-etc/asterisk/meetme.conf-dist
-@exec [ -f %B/meetme.conf ] || cp %B/%f %B/meetme.conf
-@unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi
-etc/asterisk/mgcp.conf-dist
-@exec [ -f %B/mgcp.conf ] || cp %B/%f %B/mgcp.conf
-@unexec if cmp -s %D/etc/asterisk/modem.conf %D/etc/asterisk/modem.conf-dist; then rm -f %D/etc/asterisk/modem.conf; fi
-etc/asterisk/modem.conf-dist
-@exec [ -f %B/modem.conf ] || cp %B/%f %B/modem.conf
-@unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi
-etc/asterisk/modules.conf-dist
-@exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf
-@unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi
-etc/asterisk/musiconhold.conf-dist
-@exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf
-@unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi
-etc/asterisk/oss.conf-dist
-@exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf
-@unexec if cmp -s %D/etc/asterisk/parking.conf %D/etc/asterisk/parking.conf-dist; then rm -f %D/etc/asterisk/parking.conf; fi
-etc/asterisk/parking.conf-dist
-@exec [ -f %B/parking.conf ] || cp %B/%f %B/parking.conf
-@unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi
-etc/asterisk/phone.conf-dist
-@exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf
-@unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi
-etc/asterisk/privacy.conf-dist
-@exec [ -f %B/privacy.conf ] || cp %B/%f %B/privacy.conf
-@unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi
-etc/asterisk/queues.conf-dist
-@exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf
-@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi
-etc/asterisk/rpt.conf-dist
-@exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf
-@unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi
-etc/asterisk/rtp.conf-dist
-@exec [ -f %B/rtp.conf ] || cp %B/%f %B/rtp.conf
-@unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi
-etc/asterisk/sip.conf-dist
-@exec [ -f %B/sip.conf ] || cp %B/%f %B/sip.conf
-@unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi
-etc/asterisk/skinny.conf-dist
-@exec [ -f %B/skinny.conf ] || cp %B/%f %B/skinny.conf
-@unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi
-etc/asterisk/telcordia-1.adsi-dist
-@exec [ -f %B/telcordia-1.adsi ] || cp %B/%f %B/telcordia-1.adsi
-@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi
-etc/asterisk/voicemail.conf-dist
-@exec [ -f %B/voicemail.conf ] || cp %B/%f %B/voicemail.conf
-@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi
-etc/asterisk/vpb.conf-dist
-@exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf
-@unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi
-etc/asterisk/zapata.conf-dist
-@exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf
-include/asterisk/acl.h
-include/asterisk/adsi.h
-include/asterisk/aes.h
-include/asterisk/alaw.h
-include/asterisk/app.h
-include/asterisk/ast_expr.h
-include/asterisk/astdb.h
-include/asterisk/astmm.h
-include/asterisk/callerid.h
-include/asterisk/causes.h
-include/asterisk/cdr.h
-include/asterisk/channel.h
-include/asterisk/channel_pvt.h
-include/asterisk/chanvars.h
-include/asterisk/cli.h
-include/asterisk/config.h
-include/asterisk/crypto.h
-include/asterisk/cvsid.h
-include/asterisk/dlfcn-compat.h
-include/asterisk/dns.h
-include/asterisk/dsp.h
-include/asterisk/enum.h
-include/asterisk/file.h
-include/asterisk/frame.h
-include/asterisk/fskmodem.h
-include/asterisk/image.h
-include/asterisk/indications.h
-include/asterisk/io.h
-include/asterisk/linkedlists.h
-include/asterisk/localtime.h
-include/asterisk/lock.h
-include/asterisk/logger.h
-include/asterisk/manager.h
-include/asterisk/md5.h
-include/asterisk/module.h
-include/asterisk/monitor.h
-include/asterisk/musiconhold.h
-include/asterisk/options.h
-include/asterisk/parking.h
-include/asterisk/pbx.h
-include/asterisk/poll-compat.h
-include/asterisk/privacy.h
-include/asterisk/rtp.h
-include/asterisk/say.h
-include/asterisk/sched.h
-include/asterisk/srv.h
-include/asterisk/tdd.h
-include/asterisk/term.h
-include/asterisk/translate.h
-include/asterisk/ulaw.h
-include/asterisk/vmodem.h
-lib/asterisk/modules/app_adsiprog.so
-lib/asterisk/modules/app_agi.so
-lib/asterisk/modules/app_authenticate.so
-lib/asterisk/modules/app_cdr.so
-lib/asterisk/modules/app_chanisavail.so
-lib/asterisk/modules/app_cut.so
-lib/asterisk/modules/app_datetime.so
-lib/asterisk/modules/app_db.so
-lib/asterisk/modules/app_dial.so
-lib/asterisk/modules/app_directory.so
-lib/asterisk/modules/app_disa.so
-lib/asterisk/modules/app_echo.so
-lib/asterisk/modules/app_enumlookup.so
-lib/asterisk/modules/app_festival.so
-lib/asterisk/modules/app_getcpeid.so
-lib/asterisk/modules/app_hasnewvoicemail.so
-lib/asterisk/modules/app_image.so
-lib/asterisk/modules/app_intercom.so
-lib/asterisk/modules/app_lookupblacklist.so
-lib/asterisk/modules/app_lookupcidname.so
-lib/asterisk/modules/app_macro.so
-lib/asterisk/modules/app_milliwatt.so
-lib/asterisk/modules/app_mp3.so
-lib/asterisk/modules/app_parkandannounce.so
-lib/asterisk/modules/app_playback.so
-lib/asterisk/modules/app_privacy.so
-lib/asterisk/modules/app_qcall.so
-lib/asterisk/modules/app_queue.so
-lib/asterisk/modules/app_random.so
-lib/asterisk/modules/app_read.so
-lib/asterisk/modules/app_record.so
-lib/asterisk/modules/app_sayunixtime.so
-lib/asterisk/modules/app_senddtmf.so
-lib/asterisk/modules/app_setcallerid.so
-lib/asterisk/modules/app_setcdruserfield.so
-lib/asterisk/modules/app_setcidname.so
-lib/asterisk/modules/app_setcidnum.so
-lib/asterisk/modules/app_softhangup.so
-lib/asterisk/modules/app_striplsd.so
-lib/asterisk/modules/app_substring.so
-lib/asterisk/modules/app_system.so
-lib/asterisk/modules/app_transfer.so
-lib/asterisk/modules/app_url.so
-lib/asterisk/modules/app_voicemail.so
-lib/asterisk/modules/app_waitforring.so
-lib/asterisk/modules/app_zapateller.so
-lib/asterisk/modules/cdr_csv.so
-lib/asterisk/modules/chan_agent.so
-lib/asterisk/modules/chan_h323.so
-lib/asterisk/modules/chan_iax.so
-lib/asterisk/modules/chan_iax2.so
-lib/asterisk/modules/chan_local.so
-lib/asterisk/modules/chan_mgcp.so
-lib/asterisk/modules/chan_modem.so
-lib/asterisk/modules/chan_modem_aopen.so
-lib/asterisk/modules/chan_modem_bestdata.so
-lib/asterisk/modules/chan_modem_i4l.so
-lib/asterisk/modules/chan_oss.so
-lib/asterisk/modules/chan_sip.so
-lib/asterisk/modules/chan_skinny.so
-lib/asterisk/modules/codec_a_mu.so
-lib/asterisk/modules/codec_adpcm.so
-lib/asterisk/modules/codec_alaw.so
-lib/asterisk/modules/codec_g723_1_dummy.so
-lib/asterisk/modules/codec_g729_dummy.so
-lib/asterisk/modules/codec_gsm.so
-lib/asterisk/modules/codec_ilbc.so
-lib/asterisk/modules/codec_lpc10.so
-lib/asterisk/modules/codec_speex.so
-lib/asterisk/modules/codec_ulaw.so
-lib/asterisk/modules/format_g723_1.so
-lib/asterisk/modules/format_g729.so
-lib/asterisk/modules/format_gsm.so
-lib/asterisk/modules/format_h263.so
-lib/asterisk/modules/format_jpeg.so
-lib/asterisk/modules/format_pcm.so
-lib/asterisk/modules/format_pcm_alaw.so
-lib/asterisk/modules/format_vox.so
-lib/asterisk/modules/format_wav.so
-lib/asterisk/modules/format_wav_gsm.so
-lib/asterisk/modules/pbx_config.so
-lib/asterisk/modules/pbx_spool.so
-lib/asterisk/modules/pbx_wilcalu.so
-lib/asterisk/modules/res_adsi.so
-lib/asterisk/modules/res_crypto.so
-lib/asterisk/modules/res_indications.so
-lib/asterisk/modules/res_monitor.so
-lib/asterisk/modules/res_musiconhold.so
-lib/asterisk/modules/res_parking.so
-sbin/asterisk
-sbin/astgenkey
-sbin/safe_asterisk
-share/asterisk/agi-bin/agi-test.agi
-share/asterisk/agi-bin/eagi-sphinx-test
-share/asterisk/agi-bin/eagi-test
-share/asterisk/images/asterisk-intro.jpg
-share/asterisk/keys/iaxtel.pub
-share/asterisk/mohmp3/sample-hold.mp3
-share/asterisk/sounds/agent-alreadyon.gsm
-share/asterisk/sounds/agent-incorrect.gsm
-share/asterisk/sounds/agent-loggedoff.gsm
-share/asterisk/sounds/agent-loginok.gsm
-share/asterisk/sounds/agent-newlocation.gsm
-share/asterisk/sounds/agent-pass.gsm
-share/asterisk/sounds/agent-user.gsm
-share/asterisk/sounds/auth-incorrect.gsm
-share/asterisk/sounds/auth-thankyou.gsm
-share/asterisk/sounds/beep.gsm
-share/asterisk/sounds/conf-getchannel.gsm
-share/asterisk/sounds/conf-getconfno.gsm
-share/asterisk/sounds/conf-getpin.gsm
-share/asterisk/sounds/conf-invalid.gsm
-share/asterisk/sounds/conf-invalidpin.gsm
-share/asterisk/sounds/conf-onlyperson.gsm
-share/asterisk/sounds/demo-abouttotry.gsm
-share/asterisk/sounds/demo-congrats.gsm
-share/asterisk/sounds/demo-echodone.gsm
-share/asterisk/sounds/demo-echotest.gsm
-share/asterisk/sounds/demo-enterkeywords.gsm
-share/asterisk/sounds/demo-instruct.gsm
-share/asterisk/sounds/demo-moreinfo.gsm
-share/asterisk/sounds/demo-nogo.gsm
-share/asterisk/sounds/demo-nomatch.gsm
-share/asterisk/sounds/demo-thanks.gsm
-share/asterisk/sounds/digits/0.gsm
-share/asterisk/sounds/digits/1.gsm
-share/asterisk/sounds/digits/10.gsm
-share/asterisk/sounds/digits/11.gsm
-share/asterisk/sounds/digits/12.gsm
-share/asterisk/sounds/digits/13.gsm
-share/asterisk/sounds/digits/14.gsm
-share/asterisk/sounds/digits/15.gsm
-share/asterisk/sounds/digits/16.gsm
-share/asterisk/sounds/digits/17.gsm
-share/asterisk/sounds/digits/18.gsm
-share/asterisk/sounds/digits/19.gsm
-share/asterisk/sounds/digits/2.gsm
-share/asterisk/sounds/digits/20.gsm
-share/asterisk/sounds/digits/3.gsm
-share/asterisk/sounds/digits/30.gsm
-share/asterisk/sounds/digits/4.gsm
-share/asterisk/sounds/digits/40.gsm
-share/asterisk/sounds/digits/5.gsm
-share/asterisk/sounds/digits/50.gsm
-share/asterisk/sounds/digits/6.gsm
-share/asterisk/sounds/digits/60.gsm
-share/asterisk/sounds/digits/7.gsm
-share/asterisk/sounds/digits/70.gsm
-share/asterisk/sounds/digits/8.gsm
-share/asterisk/sounds/digits/80.gsm
-share/asterisk/sounds/digits/9.gsm
-share/asterisk/sounds/digits/90.gsm
-share/asterisk/sounds/digits/a-m.gsm
-share/asterisk/sounds/digits/at.gsm
-share/asterisk/sounds/digits/day-0.gsm
-share/asterisk/sounds/digits/day-1.gsm
-share/asterisk/sounds/digits/day-2.gsm
-share/asterisk/sounds/digits/day-3.gsm
-share/asterisk/sounds/digits/day-4.gsm
-share/asterisk/sounds/digits/day-5.gsm
-share/asterisk/sounds/digits/day-6.gsm
-share/asterisk/sounds/digits/dollars.gsm
-share/asterisk/sounds/digits/h-1.gsm
-share/asterisk/sounds/digits/h-10.gsm
-share/asterisk/sounds/digits/h-11.gsm
-share/asterisk/sounds/digits/h-12.gsm
-share/asterisk/sounds/digits/h-13.gsm
-share/asterisk/sounds/digits/h-14.gsm
-share/asterisk/sounds/digits/h-15.gsm
-share/asterisk/sounds/digits/h-16.gsm
-share/asterisk/sounds/digits/h-17.gsm
-share/asterisk/sounds/digits/h-18.gsm
-share/asterisk/sounds/digits/h-19.gsm
-share/asterisk/sounds/digits/h-2.gsm
-share/asterisk/sounds/digits/h-20.gsm
-share/asterisk/sounds/digits/h-3.gsm
-share/asterisk/sounds/digits/h-30.gsm
-share/asterisk/sounds/digits/h-4.gsm
-share/asterisk/sounds/digits/h-5.gsm
-share/asterisk/sounds/digits/h-6.gsm
-share/asterisk/sounds/digits/h-7.gsm
-share/asterisk/sounds/digits/h-8.gsm
-share/asterisk/sounds/digits/h-9.gsm
-share/asterisk/sounds/digits/hundred.gsm
-share/asterisk/sounds/digits/million.gsm
-share/asterisk/sounds/digits/mon-0.gsm
-share/asterisk/sounds/digits/mon-1.gsm
-share/asterisk/sounds/digits/mon-10.gsm
-share/asterisk/sounds/digits/mon-11.gsm
-share/asterisk/sounds/digits/mon-2.gsm
-share/asterisk/sounds/digits/mon-3.gsm
-share/asterisk/sounds/digits/mon-4.gsm
-share/asterisk/sounds/digits/mon-5.gsm
-share/asterisk/sounds/digits/mon-6.gsm
-share/asterisk/sounds/digits/mon-7.gsm
-share/asterisk/sounds/digits/mon-8.gsm
-share/asterisk/sounds/digits/mon-9.gsm
-share/asterisk/sounds/digits/oclock.gsm
-share/asterisk/sounds/digits/oh.gsm
-share/asterisk/sounds/digits/p-m.gsm
-share/asterisk/sounds/digits/pound.gsm
-share/asterisk/sounds/digits/star.gsm
-share/asterisk/sounds/digits/thousand.gsm
-share/asterisk/sounds/digits/today.gsm
-share/asterisk/sounds/digits/tomorrow.gsm
-share/asterisk/sounds/digits/yesterday.gsm
-share/asterisk/sounds/dir-instr.gsm
-share/asterisk/sounds/dir-intro.gsm
-share/asterisk/sounds/dir-nomatch.gsm
-share/asterisk/sounds/dir-nomore.gsm
-share/asterisk/sounds/invalid.gsm
-share/asterisk/sounds/pbx-invalid.gsm
-share/asterisk/sounds/pbx-invalidpark.gsm
-share/asterisk/sounds/pbx-transfer.gsm
-share/asterisk/sounds/privacy-incorrect.gsm
-share/asterisk/sounds/privacy-prompt.gsm
-share/asterisk/sounds/privacy-thankyou.gsm
-share/asterisk/sounds/privacy-unident.gsm
-share/asterisk/sounds/ss-noservice.gsm
-share/asterisk/sounds/transfer.gsm
-share/asterisk/sounds/tt-allbusy.gsm
-share/asterisk/sounds/tt-monkeys.gsm
-share/asterisk/sounds/tt-monkeysintro.gsm
-share/asterisk/sounds/tt-somethingwrong.gsm
-share/asterisk/sounds/tt-weasels.gsm
-share/asterisk/sounds/vm
-share/asterisk/sounds/vm-Family.gsm
-share/asterisk/sounds/vm-Friends.gsm
-share/asterisk/sounds/vm-INBOX.gsm
-share/asterisk/sounds/vm-Old.gsm
-share/asterisk/sounds/vm-Work.gsm
-share/asterisk/sounds/vm-and.gsm
-share/asterisk/sounds/vm-changeto.gsm
-share/asterisk/sounds/vm-delete.gsm
-share/asterisk/sounds/vm-deleted.gsm
-share/asterisk/sounds/vm-extension.gsm
-share/asterisk/sounds/vm-first.gsm
-share/asterisk/sounds/vm-for.gsm
-share/asterisk/sounds/vm-forwardoptions.gsm
-share/asterisk/sounds/vm-goodbye.gsm
-share/asterisk/sounds/vm-helpexit.gsm
-share/asterisk/sounds/vm-incorrect.gsm
-share/asterisk/sounds/vm-instructions.gsm
-share/asterisk/sounds/vm-intro.gsm
-share/asterisk/sounds/vm-isonphone.gsm
-share/asterisk/sounds/vm-isunavail.gsm
-share/asterisk/sounds/vm-last.gsm
-share/asterisk/sounds/vm-login.gsm
-share/asterisk/sounds/vm-mailboxfull.gsm
-share/asterisk/sounds/vm-message.gsm
-share/asterisk/sounds/vm-messages.gsm
-share/asterisk/sounds/vm-mismatch.gsm
-share/asterisk/sounds/vm-msginstruct.gsm
-share/asterisk/sounds/vm-msgsaved.gsm
-share/asterisk/sounds/vm-newpassword.gsm
-share/asterisk/sounds/vm-next.gsm
-share/asterisk/sounds/vm-no.gsm
-share/asterisk/sounds/vm-nobodyavail.gsm
-share/asterisk/sounds/vm-nomore.gsm
-share/asterisk/sounds/vm-onefor.gsm
-share/asterisk/sounds/vm-options.gsm
-share/asterisk/sounds/vm-opts.gsm
-share/asterisk/sounds/vm-passchanged.gsm
-share/asterisk/sounds/vm-password.gsm
-share/asterisk/sounds/vm-press.gsm
-share/asterisk/sounds/vm-prev.gsm
-share/asterisk/sounds/vm-rec-busy.gsm
-share/asterisk/sounds/vm-rec-name.gsm
-share/asterisk/sounds/vm-rec-unv.gsm
-share/asterisk/sounds/vm-received.gsm
-share/asterisk/sounds/vm-reenterpassword.gsm
-share/asterisk/sounds/vm-repeat.gsm
-share/asterisk/sounds/vm-saved.gsm
-share/asterisk/sounds/vm-savedto.gsm
-share/asterisk/sounds/vm-savefolder.gsm
-share/asterisk/sounds/vm-savemessage.gsm
-share/asterisk/sounds/vm-sorry.gsm
-share/asterisk/sounds/vm-theperson.gsm
-share/asterisk/sounds/vm-tocancel.gsm
-share/asterisk/sounds/vm-toforward.gsm
-share/asterisk/sounds/vm-undelete.gsm
-share/asterisk/sounds/vm-undeleted.gsm
-share/asterisk/sounds/vm-whichbox.gsm
-share/asterisk/sounds/vm-youhave.gsm
-share/asterisk/sounds/voicemail
-@dirrm share/asterisk/sounds/digits
-@dirrm share/asterisk/sounds
-@dirrm share/asterisk/mohmp3
-@dirrm share/asterisk/keys
-@dirrm share/asterisk/images
-@dirrm share/asterisk/agi-bin
-@dirrm share/asterisk
-@dirrm lib/asterisk/modules
-@dirrm lib/asterisk
-@dirrm include/asterisk
-@dirrm etc/asterisk
-@cwd /var
-spool/asterisk/vm
-spool/asterisk/voicemail/default/1234/busy.gsm
-spool/asterisk/voicemail/default/1234/unavail.gsm
-@exec mkdir -p %D/log/asterisk/cdr-csv
-@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX
-@dirrm spool/asterisk/voicemail/default/1234/INBOX
-@dirrm spool/asterisk/voicemail/default/1234
-@dirrm spool/asterisk/voicemail/default
-@dirrm spool/asterisk/voicemail
-@dirrm spool/asterisk
-@dirrm log/asterisk/cdr-csv
-@dirrm log/asterisk
diff --git a/net/callgen323/Makefile b/net/callgen323/Makefile
deleted file mode 100644
index 0a1c5e80ab32..000000000000
--- a/net/callgen323/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Ports collection makefile for:	callgen
-# Whom:					Jakub Klausa <jacke@bofh.pl>
-# Date created:				January 15 2004
-#
-# $FreeBSD$
-
-PORTNAME=	callgen
-PORTVERSION=	1.2.6
-CATEGORIES=	net
-MASTER_SITES=	http://www.openh323.org/bin/
-DISTNAME=	callgen323_${PORTVERSION}
-
-MAINTAINER=	jacke@bofh.pl
-COMMENT=	H.323 Call Generator
-
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323:configure
-
-NOCLEANDEPENDS=	yes
-USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/callgen323
-MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
-THE_MACHTYPE=	${ARCH:S/i386/x86/}
-
-PLIST_FILES=	bin/callgen323
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/obj_${OPSYS}_${THE_MACHTYPE}_d/callgen323 ${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/net/callgen323/distinfo b/net/callgen323/distinfo
deleted file mode 100644
index a0c2d4c59253..000000000000
--- a/net/callgen323/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (callgen323_1.2.6.tar.gz) = 1428f738e3ad43e5c57aa99e132065dc
-SIZE (callgen323_1.2.6.tar.gz) = 12846
diff --git a/net/callgen323/pkg-descr b/net/callgen323/pkg-descr
deleted file mode 100644
index e54d34b07922..000000000000
--- a/net/callgen323/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Callgen323 is a simple H.323 capable call generator. It supports the 
-following:
-
- - spawning an exact number of calls.
- - receiving an exact number of calls.
- - adjust the delay between each batch of calls.
- - set the number of batches to repeat.
- - The only capability supported is G.711 ULaw 64k and user
-   indication.
-
-It makes use of PWLib and the OpenH323 stack from Equivalence Ltd Pty
-
-WWW: http://www.openh323.org/
diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile
deleted file mode 100644
index c1f72a059c7b..000000000000
--- a/net/citrix_xenapp/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-# New ports collection makefile for:	Citrix(R) ICA(R) Client
-# Date created:         20 Sep 1998
-# Whom:                 msmith
-#
-# $FreeBSD$
-#
-
-PORTNAME=	citrix_ica
-PORTVERSION=	7.00
-PORTREVISION=	1
-CATEGORIES=	net comms linux
-MASTER_SITES=
-DISTNAME=	${PORTNAME}-linuxx86-${PORTVERSION}
-
-MAINTAINER=	mbr@FreeBSD.org
-COMMENT=	Citrix(R) client for the Microsoft Windows Terminal Server
-
-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"
-
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
-
-CDIR=		${PREFIX}/ICAClient
-BINDIR=		${PREFIX}/bin
-
-NSCP=	/usr/local/libexec/netscape \
-	/usr/local/libexec/netscape-linux \
-	/usr/local/netscape \
-	/usr/local/netscape-linux \
-	/usr/local/lib/netscape \
-	/usr/local/lib/netscape-linux \
-	${MOZILLA_HOME}
-
-.include <bsd.port.pre.mk>
-
-.if exists(${PREFIX}/bin/kde-config)
-HAVE_KDE=	"\\ny"
-.endif
-
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE='The distribution file for this port may not be automatically fetched due to licensing restrictions.'
-.endif
-
-do-fetch:
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-	@${ECHO} ""
-	@${ECHO} "You have to fetch the file manually after reading and"
-	@${ECHO} "agreeing to the license at:"
-	@${ECHO} ""
-	@${ECHO} "http://www.citrix.com/download/bin/license.asp?client=linux"
-	@${ECHO} ""
-	@${ECHO} "Once linuxx86.tar.gz has been downloaded move it to"
-	@${ECHO} "${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} and restart the build."
-	@${ECHO} ""
-	@${FALSE}
-.endif
-
-do-install:
-	@if (test -d "${CDIR}") ; \
-	then \
-		${ECHO} "-----------------------------------------------------------" ; \
-		${ECHO} "" ; \
-		${ECHO} "A ${CDIR} installation does already exist." ; \
-		${ECHO} "Please move it away or delete the old port" ; \
-		${ECHO} "" ; \
-		${ECHO} "-----------------------------------------------------------" ; \
-		${FALSE} ; \
-	fi
-
-	@${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ;
-	@for dir in ${NSCP}; do \
-		if [ -e $${dir}/plugins/libnullplugin.so ]; then \
-			BIN=`${FILE} $${dir}/plugins/libnullplugin.so | ${AWK} '{print $$11}'` ; \
-			case $${BIN} in \
-			\(SYSV\),) \
-				${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ; \
-			esac \
-		fi \
-	done
-
-	${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfcmgr \
-		> ${WRKSRC}/wfcmgr.x
-	${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfica \
-		> ${WRKSRC}/wfica.x
-	cd ${WRKSRC} && ${LINUXBASE}/bin/sh -c './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 763c96f5868e..000000000000
--- a/net/citrix_xenapp/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (citrix_ica-linuxx86-7.00.tar.gz) = d4efd8075afc1e96646cad4acb740033
diff --git a/net/citrix_xenapp/files/patch-linuxx86::hinst b/net/citrix_xenapp/files/patch-linuxx86::hinst
deleted file mode 100644
index 750ceb4f2af3..000000000000
--- a/net/citrix_xenapp/files/patch-linuxx86::hinst
+++ /dev/null
@@ -1,132 +0,0 @@
---- linuxx86/hinst.orig	Thu May 22 12:30:28 2003
-+++ linuxx86/hinst	Mon Aug 11 16:52:05 2003
-@@ -2132,10 +2132,34 @@
- #
- ###############################################################################
- 
-+check_for_ns() {
-+	BIN=`/usr/bin/file $1/plugins/libnullplugin.so | /usr/bin/awk '{print $11}'`
-+	case ${BIN} in
-+	\(SYSV\),)
-+		NETSCAPE_DIR="$1"
-+		PLUGIN_PATH="$s/plugins"
-+		FOUND_NS="TRUE"
-+	esac
-+}
-+
-+NSCP="/usr/local/libexec/netscape \
-+	/usr/local/libexec/netscape-linux \
-+	/usr/local/netscape \
-+	/usr/local/netscape-linux \
-+	/usr/local/lib/netscape \
-+	/usr/local/lib/netscape-linux \
-+	/usr/local/lib/linux-mozilla \
-+	/usr/local/lib/mozilla \
-+	$MOZILLA_HOME"
-+
-+for dir in ${NSCP}; do
-+	if [ -e $dir/plugins/libnullplugin.so ]; then
-+		check_for_ns $dir;
-+	fi
-+done
-+
- INST_DIR=$ICAInstDir
- TMP_NAME=/tmp/ICAnetscape.$$
--NETSCAPE_DIR="/usr/local/lib/netscape"
--PLUGIN_PATH="/usr/local/netscape/plugins"
- PLUGIN_NAME=npica.so
- PLUGIN_CLASS=ICAClObj.class
- MAILCAP_FILE=mailcap
-@@ -2206,36 +2230,29 @@
- 
- netscape_integrate()
- {
--  $ECHO_CMD $integrate_netscape1
-   if test -z "$SU_INSTALL"
-   then
-     set_npui_variables
-     found_netscape 
-   else
-     search_ok=0
--    EXTRA_BROWSERS=`find_browsers`
--  
--    if  test -d "/usr/lib/netscape"\
--	|| test -d "/usr/local/netscape"\
--	|| test -d "/opt/netscape"\
--	|| test -d "/usr/local/lib/netscape"\
--	|| test -d "/usr/dt/appconfig/netscape"\
--	|| test "$MOZILLA_HOME" != "" -a -d "$MOZILLA_HOME"\
--	|| test "$EXTRA_BROWSERS" != ""
--    then
-+
-+   case ${FOUND_NS} in
-+   TRUE)
-   	$ECHO_CMD $integrate_netscape3
-   	found_netscape 
--    else
-+	;;
-+   *)
- 	echo_no_nl $integrate_netscape2
-  	getyesno $INSTALLER_NO
--	if [ "$ANSWER" = "$INSTALLER_YES" ]
--	then
-+	if [ "$ANSWER" = "$INSTALLER_YES" ]; then
- 		found_netscape
- 	else
-   		$ECHO_CMD $integrate_netscape6
- 	fi
--    fi
--  fi
-+   	;;
-+   esac
-+   fi
- 
-     # Create utility script files in install root.
-     create_wfica_script
-@@ -2866,37 +2883,6 @@
-     echo "$BINDIR"
- }
- 
--################################################################################
--#
--# find_browsers
--#
--# Returns a list of directories containing new-style mozilla-based browsers 
--# that may be launched by files on the $PATH.
--#
--################################################################################
--find_browsers()
--{
--    PROGS="netscape mozilla"
--    DIST_BIN_DIR=""
--    STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla"
--    for d in `echo $PATH | sed "s/:/ /g"` $STANDARD_DIRS
--    do
--	echo $d
--    done | sort -u | while read d
--    do 
--	for p in $PROGS
--	do    
--	    # Find the each instance of each named browser
--	    PROG=$d/$p
--	    if test -f $PROG
--	    then
--		# Where is the installation and what version is it?
--		find_extra_bin_dirs $PROG
--	    fi
--	done
--    done | sort -u
--}
--
- BROWSER_LIST_KEY="BROWSER_DIR"
- ################################################################################
- #
-@@ -3119,6 +3105,8 @@
- wfcmgr_NAME='Citrix ICA Client'
- DEFAULT_DT_TARGET_DIRS="/usr/share/applications \
-                         /usr/share/applnk/Applications \
-+			/usr/local/share/applnk/Internet \
-+			/usr/local/share/applnk/Networking \
-                         /usr/share/applnk-redhat/Internet \
-                         /usr/share/applnk-mdk/Networking"
- DEFAULT_DT_FOLDER="Applications"
diff --git a/net/citrix_xenapp/files/patch-setupwfc b/net/citrix_xenapp/files/patch-setupwfc
deleted file mode 100644
index 0d1b30ea8bfa..000000000000
--- a/net/citrix_xenapp/files/patch-setupwfc
+++ /dev/null
@@ -1,11 +0,0 @@
---- setupwfc.orig	Wed Apr 17 18:32:45 2002
-+++ setupwfc	Mon Jul  8 18:28:31 2002
-@@ -382,7 +382,7 @@
-                # 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.
--               if uname -m | grep 86 2>&1 >/dev/null ;then
-+               if uname -m | grep i[3456]86 2>&1 >/dev/null ;then
-                    PLATFORM=linuxx86
-                    DISP_PLATFORM="Linux (x86)"
-                elif uname -m | grep -i arm 2>&1 >/dev/null  ;then
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 e0279ba0d816..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-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 ef0b484f8912..000000000000
--- a/net/citrix_xenapp/pkg-plist
+++ /dev/null
@@ -1,133 +0,0 @@
-@unexec if [ -f %D/lib/netscape-linux/mime.types ]; then (/bin/cat %D/lib/netscape-linux/mime.types | /usr/bin/grep -v "application/x-ica" > %D/lib/netscape-linux/mime.types.tmp; mv %D/lib/netscape-linux/mime.types.tmp %D/lib/netscape-linux/mime.types); fi
-@unexec if [ -f %D/lib/netscape-linux/mailcap ]; then (/bin/cat %D/lib/netscape-linux/mailcap | /usr/bin/grep -v "application/x-ica" > %D/lib/netscape-linux/mailcap.tmp; /bin/mv %D/lib/netscape-linux/mailcap.tmp %D/lib/netscape-linux/mailcap); fi
-@unexec if [ -e %D/lib/netscape-linux/plugins/npica.so ]; then (/bin/rm %D/lib/netscape-linux/plugins/npica.so); fi
-ICAClient/.config/appsrv.ini
-ICAClient/.config/keyboard.ini
-ICAClient/.config/module.ini
-ICAClient/.config/wfclient.ini
-ICAClient/Npica
-ICAClient/Npica.ad
-ICAClient/PDCRYPT1.DLL
-ICAClient/PDCRYPT2.DLL
-ICAClient/SSL.DLL
-ICAClient/VDSCARD.DLL
-ICAClient/Wfcmgr
-ICAClient/Wfcmgr.ad
-ICAClient/Wfica
-ICAClient/Wfica.ad
-ICAClient/config/.server
-ICAClient/config/appsrv.ini
-ICAClient/config/module.ini
-ICAClient/config/wfclient.ini
-ICAClient/desktop/wfcmgr.desktop
-ICAClient/desktop/Citrix_PNA.desktop
-ICAClient/eula.txt
-ICAClient/help/index.htm
-ICAClient/icons/ica16.xpm
-ICAClient/icons/ica32.xpm
-ICAClient/icons/ica48.xpm
-ICAClient/icons/ica64.xpm
-ICAClient/icons/pn32.xpm
-ICAClient/install.txt
-ICAClient/keyboard/age2.kbd
-ICAClient/keyboard/agex2.kbd
-ICAClient/keyboard/automatic.kbd
-ICAClient/keyboard/dcint401.kbd
-ICAClient/keyboard/dcintpcx.kbd
-ICAClient/keyboard/dcus401.kbd
-ICAClient/keyboard/dcuspcx.kbd
-ICAClient/keyboard/dec401.kbd
-ICAClient/keyboard/dec401uk.kbd
-ICAClient/keyboard/decpcx.kbd
-ICAClient/keyboard/decpcxuk.kbd
-ICAClient/keyboard/dg.kbd
-ICAClient/keyboard/dgfr.kbd
-ICAClient/keyboard/dggr.kbd
-ICAClient/keyboard/dguk.kbd
-ICAClient/keyboard/dgus.kbd
-ICAClient/keyboard/hp101.kbd
-ICAClient/keyboard/hpfritf.kbd
-ICAClient/keyboard/hpgritf.kbd
-ICAClient/keyboard/hpint101.kbd
-ICAClient/keyboard/hpintps2.kbd
-ICAClient/keyboard/hpitf.kbd
-ICAClient/keyboard/hpps2.kbd
-ICAClient/keyboard/hpuk101.kbd
-ICAClient/keyboard/hpukitf.kbd
-ICAClient/keyboard/hpukps2.kbd
-ICAClient/keyboard/hpus101.kbd
-ICAClient/keyboard/hpusitf.kbd
-ICAClient/keyboard/hpusps2.kbd
-ICAClient/keyboard/ibm.kbd
-ICAClient/keyboard/keyboard.ini
-ICAClient/keyboard/linux.kbd
-ICAClient/keyboard/mac101.kbd
-ICAClient/keyboard/ncdn-101.kbd
-ICAClient/keyboard/ncdn-102.kbd
-ICAClient/keyboard/netbsd.kbd
-ICAClient/keyboard/scoos5.kbd
-ICAClient/keyboard/scouw2.kbd
-ICAClient/keyboard/sg.kbd
-ICAClient/keyboard/sgindy.kbd
-ICAClient/keyboard/sgindyfr.kbd
-ICAClient/keyboard/sgindygr.kbd
-ICAClient/keyboard/sgindyuk.kbd
-ICAClient/keyboard/sgindyus.kbd
-ICAClient/keyboard/sngr.kbd
-ICAClient/keyboard/sparc3.kbd
-ICAClient/keyboard/sparc4.kbd
-ICAClient/keyboard/sparc5.kbd
-ICAClient/keyboard/sparc6usb.kbd
-ICAClient/keyboard/sparcfr4.kbd
-ICAClient/keyboard/sparcfr5.kbd
-ICAClient/keyboard/sparcgr4.kbd
-ICAClient/keyboard/sparcgr5.kbd
-ICAClient/keyboard/sparcuk4.kbd
-ICAClient/keyboard/sparcuk5.kbd
-ICAClient/keyboard/sparcus3.kbd
-ICAClient/keyboard/sparcus4.kbd
-ICAClient/keyboard/sparcus5.kbd
-ICAClient/keyboard/trimodal.kbd
-ICAClient/keystore/cacerts/BTCTRoot.crt
-ICAClient/keystore/cacerts/Class3PCA_G2_v2.crt
-ICAClient/keystore/cacerts/Class4PCA_G2_v2.crt
-ICAClient/keystore/cacerts/GTECTGlobalRoot.crt
-ICAClient/keystore/cacerts/GTECTRoot.crt
-ICAClient/keystore/cacerts/Pcs3ss_v4.crt
-ICAClient/keystore/cacerts/SecureServer.crt
-ICAClient/nls/C
-ICAClient/nls/en/pna.nls
-ICAClient/npica.so
-ICAClient/pkginf/F.core.linuxx86
-ICAClient/pkginf/Ver.core.linuxx86
-ICAClient/pkginf/changeno.dat
-ICAClient/readme.txt
-ICAClient/setupwfc
-ICAClient/util/XCapture
-ICAClient/util/XCapture.ad
-ICAClient/util/echo_cmd
-ICAClient/util/hinst
-ICAClient/util/icalicense.sh
-ICAClient/util/nslaunch
-ICAClient/util/xcapture
-ICAClient/wfcmgr
-ICAClient/wfica
-ICAClient/wfica.sh
-ICAClient/wfica_assoc.sh
-bin/wfcmgr
-bin/wfica
-@dirrm ICAClient/.config
-@dirrm ICAClient/cache/zlcache
-@dirrm ICAClient/cache
-@dirrm ICAClient/config
-@dirrm ICAClient/desktop
-@dirrm ICAClient/help
-@dirrm ICAClient/icons
-@dirrm ICAClient/keyboard
-@dirrm ICAClient/keystore/cacerts
-@dirrm ICAClient/keystore
-@dirrm ICAClient/nls/en
-@dirrm ICAClient/nls
-@dirrm ICAClient/pkginf
-@dirrm ICAClient/util
-@dirrm ICAClient
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
deleted file mode 100644
index d7e37dd76c7e..000000000000
--- a/net/ekiga/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# Ports collection Makefile for:	gnomemeeting
-# Date created:				24/07/2001
-# Whom:					roger@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomemeeting
-PORTVERSION=	0.98.5
-PORTREVISION=	3
-CATEGORIES=	net gnome
-MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/sources/gnomemeeting/0.98/ \
-		# http://www.gnomemeeting.org/downloads/0.98.0/sources/
-
-MAINTAINER=	roger@FreeBSD.org
-COMMENT=	GNOME H323 Video Conferencing program, similar to NetMeeting
-
-BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
-
-# note, we do not want to clean openh323, otherwise it has to build
-# it all over again which can take several hours.
-NOCLEANDEPENDS= yes
-
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-USE_GNOME=	libgnomeui libbonobo gnomeprefix gnomehack
-USE_OPENLDAP=	yes
-USE_BISON=	yes
-# Clear configure target so we stop getting binaries prefixed with i386-portbld-freebsd46
-CONFIGURE_TARGET=
-GNU_CONFIGURE=	YES
-CONFIGURE_ENV=  OSTYPE=${OPSYS} \
-		LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \
-		PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323 \
-		SDL_CONFIG=${LOCALBASE}/bin/sdl11-config \
-		CPPFLAGS="-I${LOCALBASE}/include"
-
-CONFIGURE_ARGS= --with-ptlib-includes=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib/include/ptlib \
-		--with-ptlib-libs=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib/lib \
-		--with-openh323-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/include \
-		--with-openh323-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/lib \
-		--with-ldap-includes=${LOCALBASE}/include \
-		--with-openldap-libs=${LOCALBASE}/lib
-
-MAN1=		gnomemeeting.1
-.include <bsd.port.mk>
diff --git a/net/ekiga/distinfo b/net/ekiga/distinfo
deleted file mode 100644
index 23959edbe677..000000000000
--- a/net/ekiga/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnomemeeting-0.98.5.tar.bz2) = fa11d5f3e6adb924f91aaa92099b6269
-SIZE (gnomemeeting-0.98.5.tar.bz2) = 1739613
diff --git a/net/ekiga/files/patch-endpoint b/net/ekiga/files/patch-endpoint
deleted file mode 100644
index c906400224db..000000000000
--- a/net/ekiga/files/patch-endpoint
+++ /dev/null
@@ -1,37 +0,0 @@
-*** src/endpoint.cpp.orig	Thu Jul 31 17:26:36 2003
---- src/endpoint.cpp	Fri Sep  5 11:40:58 2003
-*************** GMH323EndPoint::GMH323EndPoint ()
-*** 176,183 ****
-  
-    /* Use IPv6 address family by default if available. */
-  #ifdef P_HAS_IPV6
-!   if (PIPSocket::IsIpAddressFamilyV6Supported())
-!     PIPSocket::SetDefaultIpAddressFamilyV6();
-  #endif
-    
-    rtp_port_range = 
---- 176,185 ----
-  
-    /* Use IPv6 address family by default if available. */
-  #ifdef P_HAS_IPV6
-! // ENABLING THIS CAUSES PWLIB TO GIVE AN ASSERTION WHEN THERE IS AN
-! // INCOMING CALL
-! //  if (PIPSocket::IsIpAddressFamilyV6Supported())
-! //    PIPSocket::SetDefaultIpAddressFamilyV6();
-  #endif
-    
-    rtp_port_range = 
-*************** GMH323EndPoint::TranslateTCPAddress(PIPS
-*** 682,687 ****
---- 684,694 ----
-  	 
-  	 && !((remoteAddr.Byte1() == 172) 
-  	      && ((remoteAddr.Byte2() >= 16)&&(remoteAddr.Byte2()<=31)))
-+ 	 
-+ 	 && !((remoteAddr.Byte1() == 127) 
-+ 	      &&(remoteAddr.Byte2()== 0)
-+ 	      &&(remoteAddr.Byte3()==0)
-+ 	      &&(remoteAddr.Byte4()==1))
-  	 
-  	 && !(remoteAddr.Byte1() == 10)) {
-  
diff --git a/net/ekiga/files/patch-lib_xdap_xdap.c b/net/ekiga/files/patch-lib_xdap_xdap.c
deleted file mode 100644
index 6ee81f64df0d..000000000000
--- a/net/ekiga/files/patch-lib_xdap_xdap.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/xdap/xdap.c.orig	Tue Oct 28 21:28:24 2003
-+++ lib/xdap/xdap.c	Tue Oct 28 21:49:59 2003
-@@ -159,7 +159,7 @@
-   xmlSAXHandler sax;
- 
-   memset (&sax, 0, sizeof sax);
--  sax = xmlDefaultSAXHandler;	/* Copy original handler */
-+  xmlSAX2InitDefaultSAXHandler (&sax, 0);
-   *oldgetent = sax.getEntity;	/* Substitute entity handling */
-   if (noerr) {
-     sax.error = NULL;	/* Disable errors and warnings */
diff --git a/net/ekiga/pkg-descr b/net/ekiga/pkg-descr
deleted file mode 100644
index 9a8d6e495a8d..000000000000
--- a/net/ekiga/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Gnomemeeting is a Video Conferencing application which uses the H323
-protocol and the OpenH323 libraries.
-
-It can connect to a variety of other H323 applications including
-Microsoft NetMeeting, OpenMCU, OpenAM, OhPhone and CPhone.
-
-WWW: http://www.gnomemeeting.org/
-
-Roger Hardiman <roger@freebsd.org>
diff --git a/net/ekiga/pkg-plist b/net/ekiga/pkg-plist
deleted file mode 100644
index 0b260a5dbc6b..000000000000
--- a/net/ekiga/pkg-plist
+++ /dev/null
@@ -1,117 +0,0 @@
-share/gnome/pixmaps/gnomemeeting-logo-icon.png
-share/gnome/pixmaps/gnomemeeting-logo.png
-share/gnome/pixmaps/gnomemeeting-splash.png
-bin/gnomemeeting
-bin/gnomemeeting-config-tool
-libdata/bonobo/servers/gnomemeeting.server
-share/locale/am/LC_MESSAGES/gnomemeeting.mo
-share/locale/az/LC_MESSAGES/gnomemeeting.mo
-share/locale/be/LC_MESSAGES/gnomemeeting.mo
-share/locale/ca/LC_MESSAGES/gnomemeeting.mo
-share/locale/cs/LC_MESSAGES/gnomemeeting.mo
-share/locale/cy/LC_MESSAGES/gnomemeeting.mo
-share/locale/da/LC_MESSAGES/gnomemeeting.mo
-share/locale/de/LC_MESSAGES/gnomemeeting.mo
-share/locale/el/LC_MESSAGES/gnomemeeting.mo
-share/locale/es/LC_MESSAGES/gnomemeeting.mo
-share/locale/fi/LC_MESSAGES/gnomemeeting.mo
-share/locale/fr/LC_MESSAGES/gnomemeeting.mo
-share/locale/ga/LC_MESSAGES/gnomemeeting.mo
-share/locale/gl/LC_MESSAGES/gnomemeeting.mo
-share/locale/hi/LC_MESSAGES/gnomemeeting.mo
-share/locale/hu/LC_MESSAGES/gnomemeeting.mo
-share/locale/it/LC_MESSAGES/gnomemeeting.mo
-share/locale/ja/LC_MESSAGES/gnomemeeting.mo
-share/locale/ko/LC_MESSAGES/gnomemeeting.mo
-share/locale/lv/LC_MESSAGES/gnomemeeting.mo
-share/locale/ml/LC_MESSAGES/gnomemeeting.mo
-share/locale/ms/LC_MESSAGES/gnomemeeting.mo
-share/locale/nl/LC_MESSAGES/gnomemeeting.mo
-share/locale/no/LC_MESSAGES/gnomemeeting.mo
-share/locale/pl/LC_MESSAGES/gnomemeeting.mo
-share/locale/pt/LC_MESSAGES/gnomemeeting.mo
-share/locale/pt_BR/LC_MESSAGES/gnomemeeting.mo
-share/locale/ro/LC_MESSAGES/gnomemeeting.mo
-share/locale/ru/LC_MESSAGES/gnomemeeting.mo
-share/locale/sk/LC_MESSAGES/gnomemeeting.mo
-share/locale/sq/LC_MESSAGES/gnomemeeting.mo
-share/locale/sr/LC_MESSAGES/gnomemeeting.mo
-share/locale/sr@Latn/LC_MESSAGES/gnomemeeting.mo
-share/locale/sv/LC_MESSAGES/gnomemeeting.mo
-share/locale/ta/LC_MESSAGES/gnomemeeting.mo
-share/locale/tr/LC_MESSAGES/gnomemeeting.mo
-share/locale/uk/LC_MESSAGES/gnomemeeting.mo
-share/locale/vi/LC_MESSAGES/gnomemeeting.mo
-share/locale/wa/LC_MESSAGES/gnomemeeting.mo
-share/locale/zh_CN/LC_MESSAGES/gnomemeeting.mo
-share/locale/zh_TW/LC_MESSAGES/gnomemeeting.mo
-share/gnome/sounds/gnomemeeting/gnomemeeting.wav
-etc/sound/events/gnomemeeting.soundlist
-share/gnome/gnomemeeting/xdap/ils_nm_reg.xml
-share/gnome/gnomemeeting/xdap/ils_nm_unreg.xml
-share/gnome/gnomemeeting/xdap/ils_nm_mod.xml
-share/gnome/applications/gnomemeeting.desktop
-etc/gconf/schemas/gnomemeeting.schemas
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_codecs/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/call_forwarding/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/contacts/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/devices/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/gatekeeper/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/history/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ldap/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/personal_data/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ports/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_display/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/view/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_codecs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/call_forwarding/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/contacts/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/devices/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/gatekeeper/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/history/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ldap/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/personal_data/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ports/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_display/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/view/%gconf.xml
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/view
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_settings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_display
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ports
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/personal_data
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ldap
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/history
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/gatekeeper
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/devices
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/contacts
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/call_forwarding
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_settings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_codecs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/view
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_settings
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_display
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ports
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/personal_data
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ldap
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/history
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/gatekeeper
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/devices
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/contacts
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/call_forwarding
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_settings
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_codecs
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting
-@dirrm share/gnome/sounds/gnomemeeting
-@dirrm share/gnome/gnomemeeting/xdap
-@dirrm share/gnome/gnomemeeting
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
deleted file mode 100644
index 3830cdf7e5f2..000000000000
--- a/net/freeradius2/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-# New ports collection makefile for:    freeradius
-# Date created:         May 9 2002
-# Whom:                 Brian Somers <brian@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	freeradius
-PORTVERSION=	0.9.3
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
-		ftp://ftp.Awfulhak.org/pub/radius/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A free RADIUS server implementation
-
-LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
-		ltdl.4:${PORTSDIR}/devel/libltdl
-
-LOGDIR?=	/var/log
-
-CONFLICTS=	gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
-USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
-USE_LIBTOOL_VER=13
-CONFIGURE_ARGS=	--prefix=${PREFIX} --quiet --with-logdir=${LOGDIR} \
-		--localstatedir=/var \
-		--disable-ltdl-install \
-		--with-ltdl-include=${LOCALBASE}/include \
-		--with-ltdl-lib=${LOCALBASE}/lib \
-		--with-large-files
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
-
-.if defined(WITH_OPENLDAP)
-USE_OPENLDAP=	YES
-PLIST_SUB+=	LDAP=""
-.else
-CONFIGURE_ARGS+=--without-rlm_ldap
-PLIST_SUB+=	LDAP="@comment "
-.endif
-
-.if defined(WITH_MYSQL)
-USE_MYSQL=	YES
-PLIST_SUB+=	MYSQL=""
-.else
-CONFIGURE_ARGS+=--without-rlm_sql_mysql
-PLIST_SUB+=	MYSQL="@comment "
-.endif
-
-.if defined(WITH_PGSQL) || defined(WITH_POSTGRESQL)
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7-client
-PLIST_SUB+=	PGSQL=""
-.else
-CONFIGURE_ARGS+=--without-rlm_sql_postgresql
-PLIST_SUB+=	PGSQL="@comment "
-.endif
-
-.if defined(NOPORTDOCS)
-MAKE_ENV+=		NOPORTDOCS=yes
-.endif
-
-# rlm_x99_token seems broken
-CONFIGURE_ARGS+=--without-rlm_x99_token
-PLIST_SUB+=	TOKEN="@comment "
-
-INSTALLS_SHLIB=	yes
-
-MAN1=		radclient.1 radlast.1 radtest.1 radwho.1 radzap.1
-MAN5=		acct_users.5 clients.5 dictionary.5 naslist.5 radiusd.conf.5 \
-		users.5
-MAN8=		radiusd.8 radrelay.8 radwatch.8 rlm_ippool_tool.8
-
-DICTS=		dictionary.acc dictionary.alcatel dictionary.alteon \
-	       	dictionary.altiga dictionary.aptis dictionary.ascend \
-	       	dictionary.bay dictionary.cisco dictionary.cisco.bbsm \
-		dictionary.cisco.vpn3000 dictionary.cisco.vpn5000 \
-		dictionary.colubris dictionary.columbia_university \
-	       	dictionary.compat dictionary.erx dictionary.foundry \
-	       	dictionary.freeradius dictionary.juniper \
-	       	dictionary.livingston dictionary.microsoft \
-	       	dictionary.nomadix dictionary.quintum dictionary.redback \
-	       	dictionary.shasta dictionary.shiva dictionary.tunnel \
-	       	dictionary.usr dictionary.versanet
-
-post-install:
-	@${MKDIR} ${PREFIX}/etc/raddb ${DATADIR}
-.for dict in ${DICTS}
-	${INSTALL_DATA} ${WRKSRC}/share/${dict} ${DATADIR}/${dict}
-.endfor
-	${INSTALL_SCRIPT} ${FILESDIR}/radiusd.sh ${PREFIX}/etc/rc.d/radiusd.sh
-
-.include <bsd.port.mk>
diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
deleted file mode 100644
index a99c349f6d0b..000000000000
--- a/net/freeradius2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (freeradius-0.9.3.tar.gz) = 36f33d9dd305a2c9f1089c30a9fff0b8
-SIZE (freeradius-0.9.3.tar.gz) = 1819922
diff --git a/net/freeradius2/files/patch-ab b/net/freeradius2/files/patch-ab
deleted file mode 100644
index f9beec55bde7..000000000000
--- a/net/freeradius2/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/modules/rlm_mschap/rlm_mschap.c.orig	Tue Apr  8 11:53:05 2003
-+++ src/modules/rlm_mschap/rlm_mschap.c	Tue Apr  8 11:53:32 2003
-@@ -260,10 +260,15 @@
- 	SHA1_CTX Context;
- 	char hash[20];
- 	
-+	const char *name;
-+
-+	name = strchr(user_name, '\\');
-+	name = name == NULL ? user_name : name + 1;
-+
- 	SHA1Init(&Context);
- 	SHA1Update(&Context, peer_challenge, 16);
- 	SHA1Update(&Context, auth_challenge, 16);
--	SHA1Update(&Context, user_name, strlen(user_name));
-+	SHA1Update(&Context, name, strlen(name));
- 	SHA1Final(hash, &Context);
- 	memcpy(challenge, hash, 8);
- }
diff --git a/net/freeradius2/files/patch-doc::Makefile b/net/freeradius2/files/patch-doc::Makefile
deleted file mode 100644
index 52667f1d81e7..000000000000
--- a/net/freeradius2/files/patch-doc::Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- doc/Makefile.orig	Tue Dec 24 16:49:34 2002
-+++ doc/Makefile	Wed Dec  3 13:56:45 2003
-@@ -20,12 +20,14 @@
- 	@rm -f include/*~ *~
- 
- install:
-+ifndef NOPORTDOCS
- 	$(INSTALL) -d -m 755	$(R)$(datadir)/doc
--	$(INSTALL) -d -m 755	$(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)
-+	$(INSTALL) -d -m 755	$(R)$(datadir)/doc/freeradius
- 	for i in $(DOCS) rlm_*; do \
--		$(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION); \
-+		$(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius; \
- 	done
- 	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
-+endif
- 
- common:
- 	@for dir in $(SUBDIRS); do \
diff --git a/net/freeradius2/files/patch-doc::rfc::Makefile b/net/freeradius2/files/patch-doc::rfc::Makefile
deleted file mode 100644
index cce186e1c302..000000000000
--- a/net/freeradius2/files/patch-doc::rfc::Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/rfc/Makefile.orig	Thu Nov 20 14:42:52 2003
-+++ doc/rfc/Makefile	Thu Nov 20 14:43:03 2003
-@@ -16,7 +16,7 @@
- 	rm -f refs rfc*.html *~ .rewrite index.html
- 
- install:
--	$(INSTALL) -d -m 755	$(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)/rfc
-+	$(INSTALL) -d -m 755	$(R)$(datadir)/doc/freeradius/rfc
- 	for i in `ls -1 *.txt *.html`; do \
--		$(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)/rfc; \
-+		$(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius/rfc; \
- 	done
diff --git a/net/freeradius2/files/radiusd.sh b/net/freeradius2/files/radiusd.sh
deleted file mode 100644
index 798339462cd1..000000000000
--- a/net/freeradius2/files/radiusd.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# RADIUSD_FLAGS='-xxyzsf -l stdout'
-RADIUSD_FLAGS=
-
-if [ -r /etc/defaults/rc.conf ]; then
-	. /etc/defaults/rc.conf
-	source_rc_confs
-elif [ -r /etc/rc.conf ]; then
-	. /etc/rc.conf
-fi
-
-prog=$(realpath $0) || exit 1
-dir=${prog%/*}
-PREFIX=${dir%/etc/rc.d}
-
-if [ ."$dir" = ."$prog" -o ."$PREFIX" = ."$dir" ]
-then
-	echo "$0: Cannot determine the PREFIX" >&2
-	exit 1
-fi
-
-case $1 in
-start)
-	"$PREFIX"/sbin/radiusd $RADIUSD_FLAGS && echo -n " radiusd"
-	;;
-stop)
-	if [ -f /var/run/radiusd/radiusd.pid ]; then
-		kill `cat /var/run/radiusd/radiusd.pid` && echo -n ' radiusd'
-	fi
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
diff --git a/net/freeradius2/pkg-descr b/net/freeradius2/pkg-descr
deleted file mode 100644
index 044d72cbf88d..000000000000
--- a/net/freeradius2/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-  All code in this server was written from scratch.
-  The server is mostly compatible with livingston radiusd-2.01
-  (no menus or s/key support though) but with more feautures, such as:
-
-    o Can limit max. number of simultaneous logins on a per-user basis!
-    o Multiple DEFAULT entries, that can optionally fall-through.
-    o In fact, every entry can fall-through
-    o Deny/permit access based on huntgroup users dials into
-    o Set certain parameters (such as static IP address) based on huntgroup
-    o Extra "hints" file that can select SLIP/PPP/rlogin based on
-      username pattern (Puser or user.ppp is PPP, plain "user" is rlogin etc).
-    o Can execute an external program when user has authenticated (for example
-      to run a sendmail queue).
-    o Can use `$INCLUDE filename' in radiusd.conf, users, and dictionary files
-    o Can act as a proxy server, relaying requests to a remote server
-    o Supports Vendor-Specific attributes
-    o No good documentation at all, just like the original radiusd 1.16!
-
-  Then of course for general RADIUS questions, especially if you are using
-  Livingston  / Lucent RABU equipment, there is the portmaster-radius mailing
-  list. Send mail to portmaster-radius-request@livingston.com to find
-  out how to subscribe.
-
-WWW: http://www.freeradius.org/
diff --git a/net/freeradius2/pkg-plist b/net/freeradius2/pkg-plist
deleted file mode 100644
index b361e5fe08a4..000000000000
--- a/net/freeradius2/pkg-plist
+++ /dev/null
@@ -1,320 +0,0 @@
-bin/radclient
-bin/radlast
-bin/radrelay
-bin/radtest
-bin/radwho
-bin/radzap
-bin/rlm_dbm_cat
-bin/rlm_dbm_parser
-bin/rlm_ippool_tool
-bin/smbencrypt
-etc/raddb/acct_users
-etc/raddb/attrs
-etc/raddb/clients
-etc/raddb/clients.conf
-etc/raddb/dictionary
-etc/raddb/experimental.conf
-etc/raddb/hints
-etc/raddb/huntgroups
-etc/raddb/ldap.attrmap
-etc/raddb/mssql.conf
-etc/raddb/naslist
-etc/raddb/naspasswd
-etc/raddb/oraclesql.conf
-etc/raddb/postgresql.conf
-etc/raddb/preproxy_users
-etc/raddb/proxy.conf
-etc/raddb/radiusd.conf
-etc/raddb/realms
-etc/raddb/snmp.conf
-etc/raddb/sql.conf
-etc/raddb/users
-etc/raddb/x99.conf
-etc/raddb/x99passwd.sample
-etc/rc.d/radiusd.sh
-lib/libradius-%%PORTVERSION%%.la
-lib/libradius-%%PORTVERSION%%.so
-lib/libradius.a
-lib/libradius.la
-lib/libradius.so
-lib/rlm_acct_unique-%%PORTVERSION%%.la
-lib/rlm_acct_unique-%%PORTVERSION%%.so
-lib/rlm_acct_unique.a
-lib/rlm_acct_unique.la
-lib/rlm_acct_unique.so
-lib/rlm_always-%%PORTVERSION%%.la
-lib/rlm_always-%%PORTVERSION%%.so
-lib/rlm_always.a
-lib/rlm_always.la
-lib/rlm_always.so
-lib/rlm_attr_filter-%%PORTVERSION%%.la
-lib/rlm_attr_filter-%%PORTVERSION%%.so
-lib/rlm_attr_filter.a
-lib/rlm_attr_filter.la
-lib/rlm_attr_filter.so
-lib/rlm_attr_rewrite-%%PORTVERSION%%.la
-lib/rlm_attr_rewrite-%%PORTVERSION%%.so
-lib/rlm_attr_rewrite.a
-lib/rlm_attr_rewrite.la
-lib/rlm_attr_rewrite.so
-lib/rlm_chap-%%PORTVERSION%%.la
-lib/rlm_chap-%%PORTVERSION%%.so
-lib/rlm_chap.a
-lib/rlm_chap.la
-lib/rlm_chap.so
-lib/rlm_counter-%%PORTVERSION%%.la
-lib/rlm_counter-%%PORTVERSION%%.so
-lib/rlm_counter.a
-lib/rlm_counter.la
-lib/rlm_counter.so
-lib/rlm_dbm-%%PORTVERSION%%.la
-lib/rlm_dbm-%%PORTVERSION%%.so
-lib/rlm_dbm.a
-lib/rlm_dbm.la
-lib/rlm_dbm.so
-lib/rlm_detail-%%PORTVERSION%%.la
-lib/rlm_detail-%%PORTVERSION%%.so
-lib/rlm_detail.a
-lib/rlm_detail.la
-lib/rlm_detail.so
-lib/rlm_digest-%%PORTVERSION%%.la
-lib/rlm_digest-%%PORTVERSION%%.so
-lib/rlm_digest.a
-lib/rlm_digest.la
-lib/rlm_digest.so
-lib/rlm_eap-%%PORTVERSION%%.la
-lib/rlm_eap-%%PORTVERSION%%.so
-lib/rlm_eap.a
-lib/rlm_eap.la
-lib/rlm_eap.so
-lib/rlm_eap_leap-%%PORTVERSION%%.la
-lib/rlm_eap_leap-%%PORTVERSION%%.so
-lib/rlm_eap_leap.a
-lib/rlm_eap_leap.la
-lib/rlm_eap_leap.so
-lib/rlm_eap_md5-%%PORTVERSION%%.la
-lib/rlm_eap_md5-%%PORTVERSION%%.so
-lib/rlm_eap_md5.a
-lib/rlm_eap_md5.la
-lib/rlm_eap_md5.so
-lib/rlm_eap_tls-%%PORTVERSION%%.la
-lib/rlm_eap_tls-%%PORTVERSION%%.so
-lib/rlm_eap_tls.a
-lib/rlm_eap_tls.la
-lib/rlm_eap_tls.so
-lib/rlm_exec-%%PORTVERSION%%.la
-lib/rlm_exec-%%PORTVERSION%%.so
-lib/rlm_exec.a
-lib/rlm_exec.la
-lib/rlm_exec.so
-lib/rlm_expr-%%PORTVERSION%%.la
-lib/rlm_expr-%%PORTVERSION%%.so
-lib/rlm_expr.a
-lib/rlm_expr.la
-lib/rlm_expr.so
-lib/rlm_fastusers-%%PORTVERSION%%.la
-lib/rlm_fastusers-%%PORTVERSION%%.so
-lib/rlm_fastusers.a
-lib/rlm_fastusers.la
-lib/rlm_fastusers.so
-lib/rlm_files-%%PORTVERSION%%.la
-lib/rlm_files-%%PORTVERSION%%.so
-lib/rlm_files.a
-lib/rlm_files.la
-lib/rlm_files.so
-lib/rlm_ippool-%%PORTVERSION%%.la
-lib/rlm_ippool-%%PORTVERSION%%.so
-lib/rlm_ippool.a
-lib/rlm_ippool.la
-lib/rlm_ippool.so
-%%LDAP%%lib/rlm_ldap-%%PORTVERSION%%.la
-%%LDAP%%lib/rlm_ldap-%%PORTVERSION%%.so
-%%LDAP%%lib/rlm_ldap.a
-%%LDAP%%lib/rlm_ldap.la
-%%LDAP%%lib/rlm_ldap.so
-lib/rlm_mschap-%%PORTVERSION%%.la
-lib/rlm_mschap-%%PORTVERSION%%.so
-lib/rlm_mschap.a
-lib/rlm_mschap.la
-lib/rlm_mschap.so
-lib/rlm_ns_mta_md5-%%PORTVERSION%%.la
-lib/rlm_ns_mta_md5-%%PORTVERSION%%.so
-lib/rlm_ns_mta_md5.a
-lib/rlm_ns_mta_md5.la
-lib/rlm_ns_mta_md5.so
-lib/rlm_pam-%%PORTVERSION%%.la
-lib/rlm_pam-%%PORTVERSION%%.so
-lib/rlm_pam.a
-lib/rlm_pam.la
-lib/rlm_pam.so
-lib/rlm_pap-%%PORTVERSION%%.la
-lib/rlm_pap-%%PORTVERSION%%.so
-lib/rlm_pap.a
-lib/rlm_pap.la
-lib/rlm_pap.so
-lib/rlm_preprocess-%%PORTVERSION%%.la
-lib/rlm_preprocess-%%PORTVERSION%%.so
-lib/rlm_preprocess.a
-lib/rlm_preprocess.la
-lib/rlm_preprocess.so
-lib/rlm_radutmp-%%PORTVERSION%%.la
-lib/rlm_radutmp-%%PORTVERSION%%.so
-lib/rlm_radutmp.a
-lib/rlm_radutmp.la
-lib/rlm_radutmp.so
-lib/rlm_realm-%%PORTVERSION%%.la
-lib/rlm_realm-%%PORTVERSION%%.so
-lib/rlm_realm.a
-lib/rlm_realm.la
-lib/rlm_realm.so
-lib/rlm_sql-%%PORTVERSION%%.la
-lib/rlm_sql-%%PORTVERSION%%.so
-lib/rlm_sql.a
-lib/rlm_sql.la
-lib/rlm_sql.so
-%%MYSQL%%lib/rlm_sql_mysql-%%PORTVERSION%%.so
-%%MYSQL%%lib/rlm_sql_mysql.a
-%%MYSQL%%lib/rlm_sql_mysql.la
-%%MYSQL%%lib/rlm_sql_mysql.so
-%%PGSQL%%lib/rlm_sql_postgresql-%%PORTVERSION%%.so
-%%PGSQL%%lib/rlm_sql_postgresql.a
-%%PGSQL%%lib/rlm_sql_postgresql.la
-lib/rlm_unix-%%PORTVERSION%%.la
-lib/rlm_unix-%%PORTVERSION%%.so
-lib/rlm_unix.a
-lib/rlm_unix.la
-lib/rlm_unix.so
-%%TOKEN%%lib/rlm_x99_token-%%PORTVERSION%%.la
-%%TOKEN%%lib/rlm_x99_token-%%PORTVERSION%%.so
-%%TOKEN%%lib/rlm_x99_token.a
-%%TOKEN%%lib/rlm_x99_token.la
-%%TOKEN%%lib/rlm_x99_token.so
-sbin/check-radiusd-config
-sbin/checkrad
-sbin/radiusd
-sbin/radwatch
-sbin/rc.radiusd
-%%PORTDOCS%%%%DOCSDIR%%/Autz-Type
-%%PORTDOCS%%%%DOCSDIR%%/DIFFS
-%%PORTDOCS%%%%DOCSDIR%%/MACOSX
-%%PORTDOCS%%%%DOCSDIR%%/OS2
-%%PORTDOCS%%%%DOCSDIR%%/RADIUS-LDAP.schema
-%%PORTDOCS%%%%DOCSDIR%%/RADIUS-LDAPv3.schema
-%%PORTDOCS%%%%DOCSDIR%%/RADIUS-SQL.schema
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/Simultaneous-Use
-%%PORTDOCS%%%%DOCSDIR%%/aaa.txt
-%%PORTDOCS%%%%DOCSDIR%%/ascend
-%%PORTDOCS%%%%DOCSDIR%%/bay
-%%PORTDOCS%%%%DOCSDIR%%/bugs
-%%PORTDOCS%%%%DOCSDIR%%/cisco
-%%PORTDOCS%%%%DOCSDIR%%/coding-methods.txt
-%%PORTDOCS%%%%DOCSDIR%%/configurable_failover
-%%PORTDOCS%%%%DOCSDIR%%/duplicate-users
-%%PORTDOCS%%%%DOCSDIR%%/module_interface
-%%PORTDOCS%%%%DOCSDIR%%/performance-testing
-%%PORTDOCS%%%%DOCSDIR%%/processing_users_file
-%%PORTDOCS%%%%DOCSDIR%%/proxy
-%%PORTDOCS%%%%DOCSDIR%%/radrelay
-%%PORTDOCS%%%%DOCSDIR%%/rfc/attributes.html
-%%PORTDOCS%%%%DOCSDIR%%/rfc/draft-sterman-aaa-sip-00.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/leap.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1157.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1227.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1448.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1901.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1905.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2058.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2059.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2138.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2139.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2243.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2289.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2433.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2548.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2618.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2619.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2620.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2621.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2716.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2759.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2809.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2865.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2866.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2867.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2868.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2869.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2882.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2924.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3162.txt
-%%PORTDOCS%%%%DOCSDIR%%/rlm_acct_unique
-%%PORTDOCS%%%%DOCSDIR%%/rlm_always
-%%PORTDOCS%%%%DOCSDIR%%/rlm_attr_filter
-%%PORTDOCS%%%%DOCSDIR%%/rlm_dbm
-%%PORTDOCS%%%%DOCSDIR%%/rlm_detail
-%%PORTDOCS%%%%DOCSDIR%%/rlm_digest
-%%PORTDOCS%%%%DOCSDIR%%/rlm_eap
-%%PORTDOCS%%%%DOCSDIR%%/rlm_expr
-%%PORTDOCS%%%%DOCSDIR%%/rlm_fastusers
-%%PORTDOCS%%%%DOCSDIR%%/rlm_krb5
-%%PORTDOCS%%%%DOCSDIR%%/rlm_ldap
-%%PORTDOCS%%%%DOCSDIR%%/rlm_mschap
-%%PORTDOCS%%%%DOCSDIR%%/rlm_pam
-%%PORTDOCS%%%%DOCSDIR%%/rlm_passwd
-%%PORTDOCS%%%%DOCSDIR%%/rlm_python
-%%PORTDOCS%%%%DOCSDIR%%/rlm_sql
-%%PORTDOCS%%%%DOCSDIR%%/rlm_sqlcounter
-%%PORTDOCS%%%%DOCSDIR%%/rlm_unix
-%%PORTDOCS%%%%DOCSDIR%%/rlm_x99_token
-%%PORTDOCS%%%%DOCSDIR%%/supervise-radiusd.txt
-%%PORTDOCS%%%%DOCSDIR%%/tuning_guide
-%%PORTDOCS%%%%DOCSDIR%%/variables.txt
-%%DATADIR%%/dictionary
-%%DATADIR%%/dictionary.acc
-%%DATADIR%%/dictionary.alcatel
-%%DATADIR%%/dictionary.alteon
-%%DATADIR%%/dictionary.altiga
-%%DATADIR%%/dictionary.aptis
-%%DATADIR%%/dictionary.ascend
-%%DATADIR%%/dictionary.bay
-%%DATADIR%%/dictionary.bintec
-%%DATADIR%%/dictionary.cabletron
-%%DATADIR%%/dictionary.cisco
-%%DATADIR%%/dictionary.cisco.bbsm
-%%DATADIR%%/dictionary.cisco.vpn3000
-%%DATADIR%%/dictionary.cisco.vpn5000
-%%DATADIR%%/dictionary.colubris
-%%DATADIR%%/dictionary.columbia_university
-%%DATADIR%%/dictionary.compat
-%%DATADIR%%/dictionary.erx
-%%DATADIR%%/dictionary.extreme
-%%DATADIR%%/dictionary.foundry
-%%DATADIR%%/dictionary.freeradius
-%%DATADIR%%/dictionary.itk
-%%DATADIR%%/dictionary.juniper
-%%DATADIR%%/dictionary.livingston
-%%DATADIR%%/dictionary.microsoft
-%%DATADIR%%/dictionary.netscreen
-%%DATADIR%%/dictionary.nokia
-%%DATADIR%%/dictionary.nomadix
-%%DATADIR%%/dictionary.quintum
-%%DATADIR%%/dictionary.redback
-%%DATADIR%%/dictionary.redcreek
-%%DATADIR%%/dictionary.shasta
-%%DATADIR%%/dictionary.shiva
-%%DATADIR%%/dictionary.springtide
-%%DATADIR%%/dictionary.telebit
-%%DATADIR%%/dictionary.tunnel
-%%DATADIR%%/dictionary.usr
-%%DATADIR%%/dictionary.versanet
-%%DATADIR%%/dictionary.wispr
-%%DATADIR%%/dictionary.xedia
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/raddb
-@exec mkdir -p /var/log/raddb
-@exec chmod -R og= /var/log/raddb
-@unexec rm -fr /var/log/raddb
-@exec mkdir -p /var/run/radiusd
-@unexec rm -fr /var/run/radiusd
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
deleted file mode 100644
index f9a59f978b29..000000000000
--- a/net/gnome-netstatus/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for:   gnomenetstatus
-# Date Created:			05 December 2003
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomenetstatus
-PORTVERSION=	2.6.1
-CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-netstatus/2.6
-DISTNAME=	gnome-netstatus-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A GNOME applet that shows network status
-
-USE_X_PREFIX=	yes
-USE_BZIP2=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2
-USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
-CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.mk>
diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo
deleted file mode 100644
index 52f35d8d6f93..000000000000
--- a/net/gnome-netstatus/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/gnome-netstatus-2.6.1.tar.bz2) = 8a0e9831ad6b2aa48c6f4c2b6516ab6e
-SIZE (gnome2/gnome-netstatus-2.6.1.tar.bz2) = 427214
diff --git a/net/gnome-netstatus/files/patch-configure b/net/gnome-netstatus/files/patch-configure
deleted file mode 100644
index f195f07b43c6..000000000000
--- a/net/gnome-netstatus/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed Dec 11 18:31:51 2002
-+++ configure	Thu Dec 12 12:07:17 2002
-@@ -7414,6 +7414,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net/gnome-netstatus/files/patch-icons_Makefile.in b/net/gnome-netstatus/files/patch-icons_Makefile.in
deleted file mode 100644
index 33fd6338d46f..000000000000
--- a/net/gnome-netstatus/files/patch-icons_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- icons/Makefile.in.orig	Tue Apr 20 01:06:15 2004
-+++ icons/Makefile.in	Tue Apr 20 01:06:49 2004
-@@ -137,7 +137,7 @@
- 
- iconsize = 48x48
- category = apps
--iconsdir = $(datadir)/icons/hicolor/$(iconsize)/$(category)
-+iconsdir = $(prefix)/share/icons/hicolor/$(iconsize)/$(category)
- icons_DATA =  	gnome-netstatus-disconn.png		gnome-netstatus-idle.png		gnome-netstatus-rx.png			gnome-netstatus-tx.png			gnome-netstatus-txrx.png        	gnome-netstatus-error.png
- 
- 
diff --git a/net/gnome-netstatus/files/patch-src_netstatus-iface.c b/net/gnome-netstatus/files/patch-src_netstatus-iface.c
deleted file mode 100644
index 1ffae4384ecb..000000000000
--- a/net/gnome-netstatus/files/patch-src_netstatus-iface.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/netstatus-iface.c.orig	Mon Mar 22 17:49:17 2004
-+++ src/netstatus-iface.c	Mon Mar 22 17:50:12 2004
-@@ -32,6 +32,8 @@
- 
- #include <libgnome/gnome-i18n.h>
- 
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <sys/ioctl.h>
- #ifdef HAVE_SYS_SOCKIO_H
- #include <sys/sockio.h>
-@@ -39,6 +41,7 @@
- #include <sys/param.h>
- #include <net/if.h>
- #include <net/if_arp.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- #include <errno.h>
- #include <unistd.h>
diff --git a/net/gnome-netstatus/pkg-descr b/net/gnome-netstatus/pkg-descr
deleted file mode 100644
index 0848cf01ffc2..000000000000
--- a/net/gnome-netstatus/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-Gnome-netstatus is a panel applet which provides information about 
-network interfaces.
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
deleted file mode 100644
index c4e0a7b62327..000000000000
--- a/net/gnome-netstatus/pkg-plist
+++ /dev/null
@@ -1,208 +0,0 @@
-etc/gconf/gconf.xml.defaults/apps/netstatus_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/prefs/%gconf.xml
-etc/gconf/schemas/netstatus.schemas
-libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server
-libexec/gnome-netstatus-applet
-share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml
-share/gnome/gnome-netstatus/gnome-netstatus.glade
-share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-disconn.png
-share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-error.png
-share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-idle.png
-share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-rx.png
-share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-tx.png
-share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-txrx.png
-share/gnome/help/gnome-netstatus/C/gnome-netstatus.xml
-share/gnome/help/gnome-netstatus/C/legal.xml
-share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-disconn.png
-share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-error.png
-share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-idle.png
-share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-rx.png
-share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-tx.png
-share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-txrx.png
-share/gnome/help/gnome-netstatus/de/gnome-netstatus.xml
-share/gnome/help/gnome-netstatus/de/legal.xml
-share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-disconn.png
-share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-error.png
-share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-idle.png
-share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-rx.png
-share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-tx.png
-share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-txrx.png
-share/gnome/help/gnome-netstatus/es/gnome-netstatus.xml
-share/gnome/help/gnome-netstatus/es/legal.xml
-share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-disconn.png
-share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-error.png
-share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-idle.png
-share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-rx.png
-share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-tx.png
-share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-txrx.png
-share/gnome/help/gnome-netstatus/fr/gnome-netstatus.xml
-share/gnome/help/gnome-netstatus/fr/legal.xml
-share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-disconn.png
-share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-error.png
-share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-idle.png
-share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-rx.png
-share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-tx.png
-share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-txrx.png
-share/gnome/help/gnome-netstatus/it/gnome-netstatus.xml
-share/gnome/help/gnome-netstatus/it/legal.xml
-share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-disconn.png
-share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-error.png
-share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-idle.png
-share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-rx.png
-share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-tx.png
-share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-txrx.png
-share/gnome/help/gnome-netstatus/ja/gnome-netstatus.xml
-share/gnome/help/gnome-netstatus/ja/legal.xml
-share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-disconn.png
-share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-error.png
-share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-idle.png
-share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-rx.png
-share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-tx.png
-share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-txrx.png
-share/gnome/help/gnome-netstatus/ko/gnome-netstatus.xml
-share/gnome/help/gnome-netstatus/ko/legal.xml
-share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-disconn.png
-share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-error.png
-share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-idle.png
-share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-rx.png
-share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-tx.png
-share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-txrx.png
-share/gnome/help/gnome-netstatus/sv/gnome-netstatus.xml
-share/gnome/help/gnome-netstatus/sv/legal.xml
-share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-disconn.png
-share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-error.png
-share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-idle.png
-share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-rx.png
-share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-tx.png
-share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-txrx.png
-share/gnome/help/gnome-netstatus/zh_CN/gnome-netstatus.xml
-share/gnome/help/gnome-netstatus/zh_CN/legal.xml
-share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-disconn.png
-share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-error.png
-share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-idle.png
-share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-rx.png
-share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-tx.png
-share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-txrx.png
-share/gnome/help/gnome-netstatus/zh_HK/gnome-netstatus.xml
-share/gnome/help/gnome-netstatus/zh_HK/legal.xml
-share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-disconn.png
-share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-error.png
-share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-idle.png
-share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-rx.png
-share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-tx.png
-share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-txrx.png
-share/gnome/help/gnome-netstatus/zh_TW/gnome-netstatus.xml
-share/gnome/help/gnome-netstatus/zh_TW/legal.xml
-share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf 2>/dev/null || /usr/bin/true
-share/gnome/pixmaps/gnome-netstatus-tx.png
-share/icons/hicolor/48x48/apps/gnome-netstatus-disconn.png
-share/icons/hicolor/48x48/apps/gnome-netstatus-error.png
-share/icons/hicolor/48x48/apps/gnome-netstatus-idle.png
-share/icons/hicolor/48x48/apps/gnome-netstatus-rx.png
-share/icons/hicolor/48x48/apps/gnome-netstatus-tx.png
-share/icons/hicolor/48x48/apps/gnome-netstatus-txrx.png
-share/locale/ar/LC_MESSAGES/gnome-netstatus.mo
-share/locale/az/LC_MESSAGES/gnome-netstatus.mo
-share/locale/bn/LC_MESSAGES/gnome-netstatus.mo
-share/locale/ca/LC_MESSAGES/gnome-netstatus.mo
-share/locale/cs/LC_MESSAGES/gnome-netstatus.mo
-share/locale/cy/LC_MESSAGES/gnome-netstatus.mo
-share/locale/da/LC_MESSAGES/gnome-netstatus.mo
-share/locale/de/LC_MESSAGES/gnome-netstatus.mo
-share/locale/el/LC_MESSAGES/gnome-netstatus.mo
-share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo
-share/locale/en_GB/LC_MESSAGES/gnome-netstatus.mo
-share/locale/es/LC_MESSAGES/gnome-netstatus.mo
-share/locale/fi/LC_MESSAGES/gnome-netstatus.mo
-share/locale/fr/LC_MESSAGES/gnome-netstatus.mo
-share/locale/ga/LC_MESSAGES/gnome-netstatus.mo
-share/locale/hi/LC_MESSAGES/gnome-netstatus.mo
-share/locale/hr/LC_MESSAGES/gnome-netstatus.mo
-share/locale/hu/LC_MESSAGES/gnome-netstatus.mo
-share/locale/it/LC_MESSAGES/gnome-netstatus.mo
-share/locale/ja/LC_MESSAGES/gnome-netstatus.mo
-share/locale/ko/LC_MESSAGES/gnome-netstatus.mo
-share/locale/lt/LC_MESSAGES/gnome-netstatus.mo
-share/locale/mn/LC_MESSAGES/gnome-netstatus.mo
-share/locale/ms/LC_MESSAGES/gnome-netstatus.mo
-share/locale/nl/LC_MESSAGES/gnome-netstatus.mo
-share/locale/nn/LC_MESSAGES/gnome-netstatus.mo
-share/locale/no/LC_MESSAGES/gnome-netstatus.mo
-share/locale/pa/LC_MESSAGES/gnome-netstatus.mo
-share/locale/pl/LC_MESSAGES/gnome-netstatus.mo
-share/locale/pt/LC_MESSAGES/gnome-netstatus.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-netstatus.mo
-share/locale/ro/LC_MESSAGES/gnome-netstatus.mo
-share/locale/ru/LC_MESSAGES/gnome-netstatus.mo
-share/locale/sk/LC_MESSAGES/gnome-netstatus.mo
-share/locale/sq/LC_MESSAGES/gnome-netstatus.mo
-share/locale/sr/LC_MESSAGES/gnome-netstatus.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-netstatus.mo
-share/locale/sv/LC_MESSAGES/gnome-netstatus.mo
-share/locale/th/LC_MESSAGES/gnome-netstatus.mo
-share/locale/tr/LC_MESSAGES/gnome-netstatus.mo
-share/locale/uk/LC_MESSAGES/gnome-netstatus.mo
-share/locale/vi/LC_MESSAGES/gnome-netstatus.mo
-share/locale/wa/LC_MESSAGES/gnome-netstatus.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo
-@dirrm share/gnome/omf/gnome-netstatus
-@dirrm share/gnome/help/gnome-netstatus/zh_TW/figures
-@dirrm share/gnome/help/gnome-netstatus/zh_TW
-@dirrm share/gnome/help/gnome-netstatus/zh_HK/figures
-@dirrm share/gnome/help/gnome-netstatus/zh_HK
-@dirrm share/gnome/help/gnome-netstatus/zh_CN/figures
-@dirrm share/gnome/help/gnome-netstatus/zh_CN
-@dirrm share/gnome/help/gnome-netstatus/sv/figures
-@dirrm share/gnome/help/gnome-netstatus/sv
-@dirrm share/gnome/help/gnome-netstatus/ko/figures
-@dirrm share/gnome/help/gnome-netstatus/ko
-@dirrm share/gnome/help/gnome-netstatus/ja/figures
-@dirrm share/gnome/help/gnome-netstatus/ja
-@dirrm share/gnome/help/gnome-netstatus/it/figures
-@dirrm share/gnome/help/gnome-netstatus/it
-@dirrm share/gnome/help/gnome-netstatus/fr/figures
-@dirrm share/gnome/help/gnome-netstatus/fr
-@dirrm share/gnome/help/gnome-netstatus/es/figures
-@dirrm share/gnome/help/gnome-netstatus/es
-@dirrm share/gnome/help/gnome-netstatus/de/figures
-@dirrm share/gnome/help/gnome-netstatus/de
-@dirrm share/gnome/help/gnome-netstatus/C/figures
-@dirrm share/gnome/help/gnome-netstatus/C
-@dirrm share/gnome/help/gnome-netstatus
-@dirrm share/gnome/gnome-netstatus
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet
-@dirrm etc/gconf/gconf.xml.defaults/apps/netstatus_applet
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf 2>/dev/null || /usr/bin/true
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
deleted file mode 100644
index 75eec38b0530..000000000000
--- a/net/gnome-nettool/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:   gnomenetwork
-# Date Created:			03 June 2003
-# Whom:				Adam Weinberger <adamw@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomenetwork
-PORTVERSION=	1.99.5
-PORTREVISION=	3
-CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-network/1.99
-DISTNAME=	gnome-network-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A library for writing networked servers & clients
-
-USE_X_PREFIX=	yes
-USE_BZIP2=	yes
-USE_GNOME=	gnomehack gnomeprefix libgnomeui
-USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
-CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-post-patch:
-	${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \
-		 s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";|'
-
-.include <bsd.port.mk>
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
deleted file mode 100644
index 10a870525cae..000000000000
--- a/net/gnome-nettool/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/gnome-network-1.99.5.tar.bz2) = 77532442a106d06ed2fe015f87d9b522
-SIZE (gnome2/gnome-network-1.99.5.tar.bz2) = 660804
diff --git a/net/gnome-nettool/files/patch-configure b/net/gnome-nettool/files/patch-configure
deleted file mode 100644
index f195f07b43c6..000000000000
--- a/net/gnome-nettool/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed Dec 11 18:31:51 2002
-+++ configure	Thu Dec 12 12:07:17 2002
-@@ -7414,6 +7414,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net/gnome-nettool/files/patch-gnome-netinfo::info.c b/net/gnome-nettool/files/patch-gnome-netinfo::info.c
deleted file mode 100644
index 54c795546c31..000000000000
--- a/net/gnome-nettool/files/patch-gnome-netinfo::info.c
+++ /dev/null
@@ -1,63 +0,0 @@
---- gnome-netinfo/info.c.orig	Mon Nov 24 18:29:43 2003
-+++ gnome-netinfo/info.c	Wed Dec 17 22:27:46 2003
-@@ -27,6 +27,7 @@
- #endif
- 
- 
-+#include <netinet/in.h>
- #include <sys/socket.h>	/* basic socket definitions */
- #include <arpa/inet.h>	/* inet(3) functions */
- #include <sys/un.h>	/* for Unix domain sockets */
-@@ -173,7 +174,7 @@
- 	for (ptr = buf; ptr < buf + ifc.ifc_len;) {
- 		ifr = (struct ifreq *) ptr;
- 		len = sizeof (struct sockaddr);
--#ifdef	HAVE_SOCKADDR_SA_LEN
-+#if	defined(HAVE_SOCKADDR_SA_LEN) || defined(__FreeBSD__)
- 		if (ifr->ifr_addr.sa_len > len)
- 			len = ifr->ifr_addr.sa_len;	/* length > 16 */
- #endif
-@@ -182,8 +183,12 @@
- 		if (strcmp (ifr->ifr_name, nic) != 0) {
- 			continue;
- 		}
-+
-+		memset (&data, 0, sizeof(data));
- 		
-+#ifdef __linux__
- 		data = mii_get_basic (nic);
-+#endif
- 		
- 		switch (ifr->ifr_addr.sa_family) {
- 		case AF_INET:
-@@ -306,7 +311,6 @@
- 			break;
- 		}
- 	}
--	g_free (ifr);
- }
- 
- static GList *
-@@ -321,6 +325,8 @@
- 
- 	sockfd = socket (AF_INET, SOCK_DGRAM, 0);
- 
-+	memset (&ifc, 0, sizeof (struct ifconf));
-+	memset (&buf, 0, sizeof (buf));
- 	ifc.ifc_len = sizeof (buf);
- 	ifc.ifc_req = (struct ifreq *) buf;
- 
-@@ -331,9 +337,11 @@
- 		len = sizeof (struct sockaddr);
- 
- 		iface = g_strdup (ifr->ifr_name);
--		items = g_list_append (items, iface);
-+		if (g_list_find_custom (items, iface, (GCompareFunc) g_ascii_strcasecmp) == NULL) {
-+			items = g_list_append (items, iface);
-+		}
- 
--#ifdef	HAVE_SOCKADDR_SA_LEN
-+#if defined(HAVE_SOCKADDR_SA_LEN) || defined(__FreeBSD__)
- 		if (ifr->ifr_addr.sa_len > len)
- 			len = ifr->ifr_addr.sa_len;	/* length > 16 */
- #endif
diff --git a/net/gnome-nettool/files/patch-gnome-netinfo_callbacks.c b/net/gnome-nettool/files/patch-gnome-netinfo_callbacks.c
deleted file mode 100644
index 32d818c6f24a..000000000000
--- a/net/gnome-nettool/files/patch-gnome-netinfo_callbacks.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-netinfo/callbacks.c.orig	Sat Dec  6 23:20:05 2003
-+++ gnome-netinfo/callbacks.c	Sat Dec  6 23:20:14 2003
-@@ -27,6 +27,7 @@
- #include <sys/wait.h>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <signal.h>
- 
- #include "callbacks.h"
- #include "traceroute.h"
diff --git a/net/gnome-nettool/files/patch-gnome-netinfo_netinfo.c b/net/gnome-nettool/files/patch-gnome-netinfo_netinfo.c
deleted file mode 100644
index 4048c43b48ab..000000000000
--- a/net/gnome-nettool/files/patch-gnome-netinfo_netinfo.c
+++ /dev/null
@@ -1,41 +0,0 @@
---- gnome-netinfo/netinfo.c.orig	Mon Nov 24 18:29:43 2003
-+++ gnome-netinfo/netinfo.c	Sun Dec  7 01:00:52 2003
-@@ -20,6 +20,7 @@
- 
- #include <gnome.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
- #include <signal.h>
- #include <errno.h>
- #include <sys/wait.h>
-@@ -253,14 +254,16 @@
- 	if (condition & G_IO_IN) {
- 		g_io_channel_read_line (channel, &text, &len, NULL, NULL);
- 
--		if (netinfo->process_line != NULL) {
--			(netinfo->process_line) ((gpointer) netinfo, text,
--						 len, NULL);
--		}
-+		if (text != NULL) {
-+			if (netinfo->process_line != NULL) {
-+				(netinfo->process_line) ((gpointer) netinfo, text,
-+						 	len, NULL);
-+			}
- 
--		g_free (text);
-+			g_free (text);
- 
--		return TRUE;
-+			return TRUE;
-+		}
- 	}
- 
- 	/* The condition is not G_IO_HUP | G_IO_ERR | G_IO_NVAL, so
-@@ -285,6 +288,7 @@
- 	}
- 	return FALSE;
- }
-+
- 
- void
- netinfo_stop_process_command (Netinfo * netinfo)
diff --git a/net/gnome-nettool/files/patch-gnome-netinfo_netstat.c b/net/gnome-nettool/files/patch-gnome-netinfo_netstat.c
deleted file mode 100644
index 4f0a7240ba9c..000000000000
--- a/net/gnome-nettool/files/patch-gnome-netinfo_netstat.c
+++ /dev/null
@@ -1,136 +0,0 @@
---- gnome-netinfo/netstat.c.orig	Mon Nov 24 18:29:43 2003
-+++ gnome-netinfo/netstat.c	Sun Dec  7 01:34:51 2003
-@@ -113,7 +113,11 @@
- 	}
- 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->protocol))) {
- 		/* Only works for Solaris */
-+#ifdef __FreeBSD__
-+	    	option = g_strdup ("-a -f inet -ln");
-+#else
- 		option = g_strdup ("-A inet -ln");
-+#endif
- 	}
- 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->multicast))) {
- 		/* It works for Solaris and Linux */
-@@ -266,7 +270,11 @@
- 	g_return_if_fail (line != NULL);
- 
- 	count = strip_protocol_line (line, &data);
-+#ifdef __FreeBSD__
-+	if (count == 5 || count == 6 || count == 9 || count == 10) {
-+#else
- 	if (count == 7 || count == 8) {
-+#endif
- #ifdef DEBUG
- 		g_print ("%s\t%s:%s\t%s\n", data.protocol,
- 			data.ip_src, data.port_src, data.state);
-@@ -331,11 +339,42 @@
- strip_protocol_line (gchar * line, netstat_protocol_data *data)
- {
- 	gint count = 0;
-+#ifdef __FreeBSD__
-+	gint a1, a2, a3, a4;
-+	gchar s9[30];
-+#else
- 	gchar s6[30], s7[30];
-+#endif
- 	gint n2, n3;
- 
- 	line = g_strdelimit (line, ":", ' ');
- 
-+#ifdef __FreeBSD__
-+	count = sscanf (line, NETSTAT_PROTOCOL_FORMAT,
-+			data->protocol, &n2, &n3,
-+			&a1, &a2, &a3, &a4, data->port_src,
-+			s9, data->state);
-+	g_snprintf (data->ip_src, 30, "%d.%d.%d.%d", a1, a2, a3, a4);
-+
-+	if (count == 9) {
-+	    bzero (&(data)->state, 30);
-+	}
-+
-+	if (count == 3) {
-+	    /* Handle the *.* entries. */
-+	    gchar s5[30];
-+	    count = sscanf (line, ALT_NETSTAT_PROTOCOL_FORMAT,
-+		    	    data->protocol, &n2, &n3,
-+			    data->port_src, s5,
-+			    data->state);
-+	    g_snprintf (data->ip_src, 30, "*");
-+
-+	    if (count == 5) {
-+		bzero (&(data)->state, 30);
-+	    }
-+	}
-+
-+#else
- 	count = sscanf (line, NETSTAT_PROTOCOL_FORMAT,
- 			data->protocol, &n2, &n3,
- 			data->ip_src, data->port_src, 
-@@ -344,6 +383,7 @@
- 	if (count == 7) {
- 		bzero (&(data)->state, 30);
- 	}
-+#endif
- 	
- 	return count;
- }
-@@ -405,7 +445,11 @@
- 	g_return_if_fail (line != NULL);
- 
- 	count = strip_route_line (line, &data);
-+#ifdef __FreeBSD__
-+	if (count == 6) {
-+#else
- 	if (count == 8) {
-+#endif
- #ifdef DEBUG
- 		g_print ("%s\t%s:%s\t%d\t%s\n", data.destination,
- 			data.gateway, data.netmask, data.metric,
-@@ -474,11 +518,19 @@
- 	gchar flags[30];
- 	gint ref, use;
- 
-+#ifdef __FreeBSD__
-+	count = sscanf (line, NETSTAT_ROUTE_FORMAT,
-+			data->destination,
-+			data->gateway, flags,
-+			&ref, &use, data->iface);
-+#else
-+
- 	count = sscanf (line, NETSTAT_ROUTE_FORMAT,
- 			data->destination,
- 			data->gateway, data->netmask, 
- 			flags, &(data)->metric, &ref, &use, 
- 			data->iface);
-+#endif
- 	
- 	return count;
- }
-@@ -493,7 +545,11 @@
- 	renderer = gtk_cell_renderer_text_new ();
- 	column =
- 	    gtk_tree_view_column_new_with_attributes
-+#ifdef __FreeBSD__
-+	    (_("Destination/Prefix"), renderer, "text", 0, NULL);
-+#else
- 	    (_("Destination"), renderer, "text", 0, NULL);
-+#endif
- 	gtk_tree_view_append_column (widget, column);
- 
- 	renderer = gtk_cell_renderer_text_new ();
-@@ -503,12 +559,14 @@
- 	gtk_tree_view_column_set_alignment (column, 0.5);
- 	gtk_tree_view_append_column (widget, column);
- 
-+#ifndef __FreeBSD__
- 	renderer = gtk_cell_renderer_text_new ();
- 	column =
- 	    gtk_tree_view_column_new_with_attributes
- 	    (_("Netmask"), renderer, "text", 2, NULL);
- 		
- 	gtk_tree_view_append_column (widget, column);
-+#endif
- 
- 	renderer = gtk_cell_renderer_text_new ();
- 	column =
diff --git a/net/gnome-nettool/files/patch-gnome-netinfo_netstat.h b/net/gnome-nettool/files/patch-gnome-netinfo_netstat.h
deleted file mode 100644
index 6e00ba018f0b..000000000000
--- a/net/gnome-nettool/files/patch-gnome-netinfo_netstat.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- gnome-netinfo/netstat.h.orig	Sun Jul 20 22:31:57 2003
-+++ gnome-netinfo/netstat.h	Sun Dec  7 01:32:10 2003
-@@ -28,6 +28,11 @@
- #   define NETSTAT_PROTOCOL_FORMAT "%s %d %d %s %s %s %s %s" 
- #   define NETSTAT_ROUTE_FORMAT "%s %s %s %s %d %d %d %s" 
- #   define NETSTAT_MULTICAST_FORMAT "%s %d %s" 
-+#elif defined(__FreeBSD__)
-+#   define NETSTAT_PROTOCOL_FORMAT "%s %d %d %d.%d.%d.%d.%s %s %s"
-+#   define ALT_NETSTAT_PROTOCOL_FORMAT "%s %d %d *.%s %s %s"
-+#   define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s"
-+#   define NETSTAT_MULTICAST_FORMAT "%s %d %s"
- 
- #endif
- 
diff --git a/net/gnome-nettool/files/patch-gnome-netinfo_ping.c b/net/gnome-nettool/files/patch-gnome-netinfo_ping.c
deleted file mode 100644
index 40f2b83fa6b1..000000000000
--- a/net/gnome-nettool/files/patch-gnome-netinfo_ping.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-netinfo/ping.c.orig	Sat Dec  6 23:08:52 2003
-+++ gnome-netinfo/ping.c	Sat Dec  6 23:17:35 2003
-@@ -330,6 +330,8 @@
- 
- 	if (netinfo_get_ip_version (netinfo) == IPV4)
- 		line = g_strdelimit (line, ":", ' ');
-+	else
-+	    	line = g_strdelimit (line, ",", ' ');
- 
- #ifdef PING_PARAMS_5
- 	count = sscanf (line, PING_FORMAT,
diff --git a/net/gnome-nettool/files/patch-gnome-netinfo_ping.h b/net/gnome-nettool/files/patch-gnome-netinfo_ping.h
deleted file mode 100644
index debf4603d263..000000000000
--- a/net/gnome-nettool/files/patch-gnome-netinfo_ping.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-netinfo/ping.h.orig	Sat Dec  6 23:11:01 2003
-+++ gnome-netinfo/ping.h	Sat Dec  6 23:17:53 2003
-@@ -25,7 +25,7 @@
- 
- /* The ping usage and output is different between Unix flavours */
- /* FIXME: Add BSD support */
--#if defined(__linux__) || defined(__OSF__)
-+#if defined(__linux__) || defined(__OSF__) || defined(__FreeBSD__)
- #   define PING_PROGRAM_FORMAT "%s ping -c %d -n %s"
- #   define PING_PROGRAM_FORMAT_6 "%s ping6 -c %d -n %s"
- #   define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
diff --git a/net/gnome-nettool/files/patch-gnome-netinfo_util-mii.c b/net/gnome-nettool/files/patch-gnome-netinfo_util-mii.c
deleted file mode 100644
index 9d38a3d3daa6..000000000000
--- a/net/gnome-nettool/files/patch-gnome-netinfo_util-mii.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- gnome-netinfo/util-mii.c.orig	Sat Dec  6 23:30:50 2003
-+++ gnome-netinfo/util-mii.c	Sat Dec  6 23:38:14 2003
-@@ -39,6 +39,7 @@
-  * http://www.national.com/pf/DP/DP83840.html
-  */
- 
-+#ifdef __linux__
- #include <glib.h>
- 
- #include <errno.h>
-@@ -237,3 +238,4 @@
- 	close (sock);
- 	return data;
- }
-+#endif
diff --git a/net/gnome-nettool/files/patch-network-utilities_gnome-remote-shell.c b/net/gnome-nettool/files/patch-network-utilities_gnome-remote-shell.c
deleted file mode 100644
index 0ac22218e1ab..000000000000
--- a/net/gnome-nettool/files/patch-network-utilities_gnome-remote-shell.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- network-utilities/gnome-remote-shell.c.orig	Mon Sep  1 01:56:21 2003
-+++ network-utilities/gnome-remote-shell.c	Mon Sep  1 01:58:11 2003
-@@ -23,6 +23,9 @@
- #endif
- 
- #include <netdb.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
- #include <gconf/gconf-client.h>
- #include <gtk/gtkdialog.h>
- #include <gtk/gtkentry.h>
diff --git a/net/gnome-nettool/pkg-descr b/net/gnome-nettool/pkg-descr
deleted file mode 100644
index 1362640b6f11..000000000000
--- a/net/gnome-nettool/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-gnome-network is a set of network oriented user tools. It includes the
-following tools:
-
-        * gnome-remote-shell: a remote shell (Telnet/SSH) client.
-        * gnome-remote-desktop: a remote desktop (X11/VNC) client.
-        * gnome-netinfo: a network information tool, for getting info on
-          network cards, DNS, etc.
-        * gnome-backup: a backup client tool.
-
-WWW: http://www.gnome.org/
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
deleted file mode 100644
index 5c7e7394dfcc..000000000000
--- a/net/gnome-nettool/pkg-plist
+++ /dev/null
@@ -1,56 +0,0 @@
-bin/gnome-remote-shell
-bin/gnome-remote-desktop
-bin/gnome-netinfo
-share/gnome/application-registry/gnome-remote-desktop.applications
-share/gnome/applications/gnome-network-utilities.desktop
-share/gnome/applications/gnome-netinfo.desktop
-share/gnome/apps/Internet/gnome-remote-desktop.desktop
-share/gnome/gnome-network/dialogs/gnome-netinfo.glade
-share/gnome/gnome-network/dialogs/gnome-remote-shell.glade
-share/gnome/mime-info/gnome-remote-desktop.keys
-share/gnome/mime-info/gnome-remote-desktop.mime
-share/gnome/pixmaps/gnome-netinfo.png
-share/gnome/pixmaps/gnome-network/colors.png
-share/gnome/pixmaps/gnome-network/computer.png
-share/gnome/pixmaps/gnome-network/gnome-remote-desktop.png
-share/gnome/pixmaps/gnome-network/keyboard.png
-share/gnome/pixmaps/gnome-network/perform.png
-share/gnome/pixmaps/gnome-network/program.png
-share/gnome/pixmaps/gnome-network/size.png
-share/gnome/pixmaps/gnome-network/sound.png
-share/gnome/pixmaps/gnome-remote-desktop.png
-share/gnome/pixmaps/gnome-remote-shell.png
-share/locale/az/LC_MESSAGES/gnome-network.mo
-share/locale/ca/LC_MESSAGES/gnome-network.mo
-share/locale/cs/LC_MESSAGES/gnome-network.mo
-share/locale/da/LC_MESSAGES/gnome-network.mo
-share/locale/de/LC_MESSAGES/gnome-network.mo
-share/locale/el/LC_MESSAGES/gnome-network.mo
-share/locale/es/LC_MESSAGES/gnome-network.mo
-share/locale/fr/LC_MESSAGES/gnome-network.mo
-share/locale/ga/LC_MESSAGES/gnome-network.mo
-share/locale/gl/LC_MESSAGES/gnome-network.mo
-share/locale/he/LC_MESSAGES/gnome-network.mo
-share/locale/hu/LC_MESSAGES/gnome-network.mo
-share/locale/it/LC_MESSAGES/gnome-network.mo
-share/locale/ja/LC_MESSAGES/gnome-network.mo
-share/locale/ko/LC_MESSAGES/gnome-network.mo
-share/locale/ms/LC_MESSAGES/gnome-network.mo
-share/locale/nl/LC_MESSAGES/gnome-network.mo
-share/locale/no/LC_MESSAGES/gnome-network.mo
-share/locale/pl/LC_MESSAGES/gnome-network.mo
-share/locale/pt/LC_MESSAGES/gnome-network.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-network.mo
-share/locale/ru/LC_MESSAGES/gnome-network.mo
-share/locale/sr/LC_MESSAGES/gnome-network.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-network.mo
-share/locale/sv/LC_MESSAGES/gnome-network.mo
-share/locale/tr/LC_MESSAGES/gnome-network.mo
-share/locale/uk/LC_MESSAGES/gnome-network.mo
-share/locale/vi/LC_MESSAGES/gnome-network.mo
-share/locale/wa/LC_MESSAGES/gnome-network.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-network.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-network.mo
-@dirrm share/gnome/pixmaps/gnome-network
-@dirrm share/gnome/gnome-network/dialogs
-@dirrm share/gnome/gnome-network
diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile
deleted file mode 100644
index 34daf7e75d0b..000000000000
--- a/net/gnomeicu/gnomeicu/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# Ports collection Makefile for:	GnomeICU
-# Date created:				03/16/1999
-# Whom:					nectar@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomeicu2
-PORTVERSION=	0.99.5
-CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gnomeicu
-DISTNAME=	gnomeicu-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME2 ICQ client
-
-LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
-
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel lthack libxml2
-USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
-USE_REINPLACE=	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
-.elif defined(WITH_SOCKS5)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
-SOCKSFLAGS=	-DSOCKS -include ${LOCALBASE}/include/socks.h
-SOCKSLIBS=	-lsocks5
-.endif
-
-CONFIGURE_ARGS=	--with-statusmenu
-CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS} -lintl" \
-		CFLAGS="${CFLAGS}"
-
-.ifndef(WITHOUT_GTKSPELL)
-LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
-CONFIGURE_ARGS+=--enable-gtkspell
-.else
-CONFIGURE_ARGS+=--disable-gtkspell
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|GNOME_PARAM_GNOME_DATADIR|GNOME_PARAM_APP_DATADIR|g' \
-		${WRKSRC}/src/gnomeicu.c
-
-.include <bsd.port.mk>
diff --git a/net/gnomeicu/gnomeicu/distinfo b/net/gnomeicu/gnomeicu/distinfo
deleted file mode 100644
index 4121cb36ef7c..000000000000
--- a/net/gnomeicu/gnomeicu/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnomeicu-0.99.5.tar.bz2) = 59ff902171a14ad37896f6661ddedb7a
-SIZE (gnomeicu-0.99.5.tar.bz2) = 2102452
diff --git a/net/gnomeicu/gnomeicu/files/patch-src::icu_db.c b/net/gnomeicu/gnomeicu/files/patch-src::icu_db.c
deleted file mode 100644
index 3df66fcf8c50..000000000000
--- a/net/gnomeicu/gnomeicu/files/patch-src::icu_db.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- src/icu_db.c.orig	Sat Jun 22 22:11:46 2002
-+++ src/icu_db.c	Wed Sep 11 11:45:05 2002
-@@ -27,7 +27,11 @@
- 
- #include <fcntl.h>
- #include <errno.h>
-+#if defined(HAVE_STDLIB_H)
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <string.h>
- #include <sys/param.h>
diff --git a/net/gnomeicu/gnomeicu/files/patch-src_userserver.c b/net/gnomeicu/gnomeicu/files/patch-src_userserver.c
deleted file mode 100644
index 23e5ed601943..000000000000
--- a/net/gnomeicu/gnomeicu/files/patch-src_userserver.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/userserver.c.orig	Fri Apr  2 15:20:45 2004
-+++ src/userserver.c	Fri Apr  2 15:20:54 2004
-@@ -6,12 +6,12 @@
- ***************************/
- 
- #include <errno.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <pwd.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/un.h>
diff --git a/net/gnomeicu/gnomeicu/files/patch-src_v7login.c b/net/gnomeicu/gnomeicu/files/patch-src_v7login.c
deleted file mode 100644
index cea1c7fbe447..000000000000
--- a/net/gnomeicu/gnomeicu/files/patch-src_v7login.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/v7login.c.orig	Fri Apr  2 15:25:21 2004
-+++ src/v7login.c	Fri Apr  2 15:25:57 2004
-@@ -18,6 +18,7 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <netdb.h>
- #include <unistd.h>
- #include <fcntl.h>
diff --git a/net/gnomeicu/gnomeicu/files/patch-src_v7newuser.c b/net/gnomeicu/gnomeicu/files/patch-src_v7newuser.c
deleted file mode 100644
index e235da7be9c0..000000000000
--- a/net/gnomeicu/gnomeicu/files/patch-src_v7newuser.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/v7newuser.c.orig	Fri Apr  2 15:26:51 2004
-+++ src/v7newuser.c	Fri Apr  2 15:27:04 2004
-@@ -19,6 +19,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <netdb.h>
- #include <unistd.h>
- #include <fcntl.h>
diff --git a/net/gnomeicu/gnomeicu/files/patch-src_v7recv.c b/net/gnomeicu/gnomeicu/files/patch-src_v7recv.c
deleted file mode 100644
index 43a64d9961cd..000000000000
--- a/net/gnomeicu/gnomeicu/files/patch-src_v7recv.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/v7recv.c.orig	Fri Apr  2 15:27:50 2004
-+++ src/v7recv.c	Fri Apr  2 15:28:03 2004
-@@ -27,6 +27,7 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <netdb.h>
- #include <unistd.h>
- #include <fcntl.h>
diff --git a/net/gnomeicu/gnomeicu/pkg-descr b/net/gnomeicu/gnomeicu/pkg-descr
deleted file mode 100644
index df8c0c64984b..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
- Gnome2, a growingly popular desktop environment. GnomeICU is released
- under the GNU Public License, and is available free of charge.
-
-WWW: http://gnomeicu.sourceforge.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 84142858de25..000000000000
--- a/net/gnomeicu/gnomeicu/pkg-plist
+++ /dev/null
@@ -1,347 +0,0 @@
-bin/gnomeicu
-bin/gnomeicu-client
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/connections/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/events/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/files/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/status/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/themes/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq/color/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq/network/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/connections/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/events/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/files/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/status/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/themes/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq/color/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq/network/%gconf.xml
-etc/gconf/schemas/gnomeicu.schemas
-etc/sound/events/GnomeICU.soundlist
-share/gnome/applications/GnomeICU.desktop
-share/gnome/gnomeicu/emoticons/AIM/angel.xpm
-share/gnome/gnomeicu/emoticons/AIM/bigsmile.xpm
-share/gnome/gnomeicu/emoticons/AIM/crossedlips.xpm
-share/gnome/gnomeicu/emoticons/AIM/cry.xpm
-share/gnome/gnomeicu/emoticons/AIM/embarrassed.xpm
-share/gnome/gnomeicu/emoticons/AIM/emoticon-data
-share/gnome/gnomeicu/emoticons/AIM/kiss.xpm
-share/gnome/gnomeicu/emoticons/AIM/sad.xpm
-share/gnome/gnomeicu/emoticons/AIM/scream.xpm
-share/gnome/gnomeicu/emoticons/AIM/smile.xpm
-share/gnome/gnomeicu/emoticons/AIM/smile8.xpm
-share/gnome/gnomeicu/emoticons/AIM/think.xpm
-share/gnome/gnomeicu/emoticons/AIM/tongue.xpm
-share/gnome/gnomeicu/emoticons/AIM/wink.xpm
-share/gnome/gnomeicu/emoticons/Always/Annoyed.bmp
-share/gnome/gnomeicu/emoticons/Always/Disgusted.bmp
-share/gnome/gnomeicu/emoticons/Always/Drooling.bmp
-share/gnome/gnomeicu/emoticons/Always/Giggling.bmp
-share/gnome/gnomeicu/emoticons/Always/Jokingly.bmp
-share/gnome/gnomeicu/emoticons/Always/Shocked.bmp
-share/gnome/gnomeicu/emoticons/Always/Surprised-F.bmp
-share/gnome/gnomeicu/emoticons/Always/Surprised-M.bmp
-share/gnome/gnomeicu/emoticons/Always/Whining.bmp
-share/gnome/gnomeicu/emoticons/Always/asl.gif
-share/gnome/gnomeicu/emoticons/Always/bat.gif
-share/gnome/gnomeicu/emoticons/Always/beer.gif
-share/gnome/gnomeicu/emoticons/Always/boy.gif
-share/gnome/gnomeicu/emoticons/Always/broken_heart.gif
-share/gnome/gnomeicu/emoticons/Always/cake.gif
-share/gnome/gnomeicu/emoticons/Always/camera.gif
-share/gnome/gnomeicu/emoticons/Always/cat.gif
-share/gnome/gnomeicu/emoticons/Always/clock.gif
-share/gnome/gnomeicu/emoticons/Always/coffee.gif
-share/gnome/gnomeicu/emoticons/Always/cuffs.gif
-share/gnome/gnomeicu/emoticons/Always/dog.gif
-share/gnome/gnomeicu/emoticons/Always/dude_hug.gif
-share/gnome/gnomeicu/emoticons/Always/emoticon-data
-share/gnome/gnomeicu/emoticons/Always/envelope.gif
-share/gnome/gnomeicu/emoticons/Always/film.gif
-share/gnome/gnomeicu/emoticons/Always/girl.gif
-share/gnome/gnomeicu/emoticons/Always/girl_hug.gif
-share/gnome/gnomeicu/emoticons/Always/heart.gif
-share/gnome/gnomeicu/emoticons/Always/martini.gif
-share/gnome/gnomeicu/emoticons/Always/messenger.gif
-share/gnome/gnomeicu/emoticons/Always/moon.gif
-share/gnome/gnomeicu/emoticons/Always/musical_note.gif
-share/gnome/gnomeicu/emoticons/Always/phone.gif
-share/gnome/gnomeicu/emoticons/Always/present.gif
-share/gnome/gnomeicu/emoticons/Always/rainbow.gif
-share/gnome/gnomeicu/emoticons/Always/rose.gif
-share/gnome/gnomeicu/emoticons/Always/star.gif
-share/gnome/gnomeicu/emoticons/Always/sun.gif
-share/gnome/gnomeicu/emoticons/Always/thumbs_down.gif
-share/gnome/gnomeicu/emoticons/Always/thumbs_up.gif
-share/gnome/gnomeicu/emoticons/Always/wilted_rose.gif
-share/gnome/gnomeicu/emoticons/Default/bigsmile.png
-share/gnome/gnomeicu/emoticons/Default/cry.png
-share/gnome/gnomeicu/emoticons/Default/emoticon-data
-share/gnome/gnomeicu/emoticons/Default/glasses.png
-share/gnome/gnomeicu/emoticons/Default/sad.png
-share/gnome/gnomeicu/emoticons/Default/scream.png
-share/gnome/gnomeicu/emoticons/Default/smile.png
-share/gnome/gnomeicu/emoticons/Default/smile2.png
-share/gnome/gnomeicu/emoticons/Default/smile8.png
-share/gnome/gnomeicu/emoticons/Default/straight.png
-share/gnome/gnomeicu/emoticons/Default/tongue.png
-share/gnome/gnomeicu/emoticons/Default/unsure.png
-share/gnome/gnomeicu/emoticons/Default/wink.png
-share/gnome/gnomeicu/emoticons/MSN/angel.png
-share/gnome/gnomeicu/emoticons/MSN/angry.png
-share/gnome/gnomeicu/emoticons/MSN/bigsmile.png
-share/gnome/gnomeicu/emoticons/MSN/confused.png
-share/gnome/gnomeicu/emoticons/MSN/cry.png
-share/gnome/gnomeicu/emoticons/MSN/devil.png
-share/gnome/gnomeicu/emoticons/MSN/embarassed.png
-share/gnome/gnomeicu/emoticons/MSN/emoticon-data
-share/gnome/gnomeicu/emoticons/MSN/kiss.png
-share/gnome/gnomeicu/emoticons/MSN/light.gif
-share/gnome/gnomeicu/emoticons/MSN/sad.png
-share/gnome/gnomeicu/emoticons/MSN/shocked.png
-share/gnome/gnomeicu/emoticons/MSN/smile.png
-share/gnome/gnomeicu/emoticons/MSN/smile8.png
-share/gnome/gnomeicu/emoticons/MSN/straight.png
-share/gnome/gnomeicu/emoticons/MSN/tongue.png
-share/gnome/gnomeicu/emoticons/MSN/wink.png
-share/gnome/gnomeicu/emoticons/Yahoo/alien.gif
-share/gnome/gnomeicu/emoticons/Yahoo/angel.gif
-share/gnome/gnomeicu/emoticons/Yahoo/angry.gif
-share/gnome/gnomeicu/emoticons/Yahoo/bigsmile.gif
-share/gnome/gnomeicu/emoticons/Yahoo/blush.gif
-share/gnome/gnomeicu/emoticons/Yahoo/clown.gif
-share/gnome/gnomeicu/emoticons/Yahoo/cow.gif
-share/gnome/gnomeicu/emoticons/Yahoo/cowboy.gif
-share/gnome/gnomeicu/emoticons/Yahoo/devil.gif
-share/gnome/gnomeicu/emoticons/Yahoo/emoticon-data
-share/gnome/gnomeicu/emoticons/Yahoo/flag.gif
-share/gnome/gnomeicu/emoticons/Yahoo/green.gif
-share/gnome/gnomeicu/emoticons/Yahoo/hrmph.gif
-share/gnome/gnomeicu/emoticons/Yahoo/ignore.gif
-share/gnome/gnomeicu/emoticons/Yahoo/kiss.gif
-share/gnome/gnomeicu/emoticons/Yahoo/light.gif
-share/gnome/gnomeicu/emoticons/Yahoo/monkey.gif
-share/gnome/gnomeicu/emoticons/Yahoo/nerd.gif
-share/gnome/gnomeicu/emoticons/Yahoo/pig.gif
-share/gnome/gnomeicu/emoticons/Yahoo/pumpkin.gif
-share/gnome/gnomeicu/emoticons/Yahoo/quiet.gif
-share/gnome/gnomeicu/emoticons/Yahoo/rofl.gif
-share/gnome/gnomeicu/emoticons/Yahoo/rose.gif
-share/gnome/gnomeicu/emoticons/Yahoo/sad.gif
-share/gnome/gnomeicu/emoticons/Yahoo/shocked.gif
-share/gnome/gnomeicu/emoticons/Yahoo/skull.gif
-share/gnome/gnomeicu/emoticons/Yahoo/sleep.gif
-share/gnome/gnomeicu/emoticons/Yahoo/smile.gif
-share/gnome/gnomeicu/emoticons/Yahoo/smile8.gif
-share/gnome/gnomeicu/emoticons/Yahoo/stop.gif
-share/gnome/gnomeicu/emoticons/Yahoo/straight.gif
-share/gnome/gnomeicu/emoticons/Yahoo/tongue.gif
-share/gnome/gnomeicu/emoticons/Yahoo/wail.gif
-share/gnome/gnomeicu/emoticons/Yahoo/wink.gif
-share/gnome/gnomeicu/emoticons/Yahoo/wonder.gif
-share/gnome/gnomeicu/glade/addcontact.glade
-share/gnome/gnomeicu/glade/auth.glade
-share/gnome/gnomeicu/glade/auto_respond.glade
-share/gnome/gnomeicu/glade/grpmgr.glade
-share/gnome/gnomeicu/glade/history.glade
-share/gnome/gnomeicu/glade/main.glade
-share/gnome/gnomeicu/glade/message.glade
-share/gnome/gnomeicu/glade/prefs.glade
-share/gnome/gnomeicu/glade/user_info.glade
-share/gnome/gnomeicu/glade/welcome.glade
-share/gnome/gnomeicu/icons/Default/gnomeicu-animation.gif
-share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-away.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-birthday.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-blank.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-cancel.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-chat.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-contact.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-dnd.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-ffc.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-file.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-group.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-hist.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-info
-share/gnome/gnomeicu/icons/Default/gnomeicu-info.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-inv.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-message.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-na.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-occ.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-offline.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-ok.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-online.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-rename.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-still.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-url.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-animation.gif
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-auth.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-away.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-cancel.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-chat.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-contact.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-dnd.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-ffc.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-file.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-hist.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-info
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-info.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-inv.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-message.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-na.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-occ.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-offline.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-ok.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-online.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-rename.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-still.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-url.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-animation.gif
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-away.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-dnd.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-ffc.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-info
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-inv.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-na.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-occ.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-offline.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-online.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-away.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-dnd.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-ffc.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-info
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-inv.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-na.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-occ.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-offline.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png
-share/gnome/gnomeicu/prefs_icon_gnomeicu.png
-share/gnome/gnomeicu/prefs_icon_icq.png
-share/gnome/help/gnomeicu/C/figures/addcontactdruid.png
-share/gnome/help/gnomeicu/C/figures/mainwindow.png
-share/gnome/help/gnomeicu/C/figures/messagedialog.png
-share/gnome/help/gnomeicu/C/figures/notificationicon.png
-share/gnome/help/gnomeicu/C/figures/prefdialog.png
-share/gnome/help/gnomeicu/C/figures/sendcontactlist.png
-share/gnome/help/gnomeicu/C/figures/sendfile.png
-share/gnome/help/gnomeicu/C/figures/sendurl.png
-share/gnome/help/gnomeicu/C/figures/userinfo.png
-share/gnome/help/gnomeicu/C/gnomeicu.xml
-share/gnome/help/gnomeicu/uk/figures/addcontactdruid.png
-share/gnome/help/gnomeicu/uk/figures/mainwindow.png
-share/gnome/help/gnomeicu/uk/figures/messagedialog.png
-share/gnome/help/gnomeicu/uk/figures/notificationicon.png
-share/gnome/help/gnomeicu/uk/figures/prefdialog.png
-share/gnome/help/gnomeicu/uk/figures/sendcontactlist.png
-share/gnome/help/gnomeicu/uk/figures/sendfile.png
-share/gnome/help/gnomeicu/uk/figures/sendurl.png
-share/gnome/help/gnomeicu/uk/figures/userinfo.png
-share/gnome/help/gnomeicu/uk/gnomeicu.xml
-share/gnome/omf/gnomeicu/gnomeicu-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnomeicu/gnomeicu-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnomeicu/gnomeicu-uk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnomeicu/gnomeicu-uk.omf 2>/dev/null || /usr/bin/true
-share/gnome/pixmaps/gnome-gnomeicu.png
-share/gnome/sounds/gnomeicu/Auth.wav
-share/gnome/sounds/gnomeicu/File.wav
-share/gnome/sounds/gnomeicu/Online.wav
-share/gnome/sounds/gnomeicu/URL.wav
-share/gnome/sounds/gnomeicu/contlist.wav
-share/gnome/sounds/gnomeicu/message.wav
-share/locale/am/LC_MESSAGES/gnomeicu.mo
-share/locale/az/LC_MESSAGES/gnomeicu.mo
-share/locale/be/LC_MESSAGES/gnomeicu.mo
-share/locale/bg/LC_MESSAGES/gnomeicu.mo
-share/locale/ca/LC_MESSAGES/gnomeicu.mo
-share/locale/cs/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/en_CA/LC_MESSAGES/gnomeicu.mo
-share/locale/en_GB/LC_MESSAGES/gnomeicu.mo
-share/locale/es/LC_MESSAGES/gnomeicu.mo
-share/locale/eu/LC_MESSAGES/gnomeicu.mo
-share/locale/fi/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/he/LC_MESSAGES/gnomeicu.mo
-share/locale/hr/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/lv/LC_MESSAGES/gnomeicu.mo
-share/locale/mk/LC_MESSAGES/gnomeicu.mo
-share/locale/ml/LC_MESSAGES/gnomeicu.mo
-share/locale/ms/LC_MESSAGES/gnomeicu.mo
-share/locale/nl/LC_MESSAGES/gnomeicu.mo
-share/locale/nn/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/ro/LC_MESSAGES/gnomeicu.mo
-share/locale/ru/LC_MESSAGES/gnomeicu.mo
-share/locale/sk/LC_MESSAGES/gnomeicu.mo
-share/locale/sl/LC_MESSAGES/gnomeicu.mo
-share/locale/sr/LC_MESSAGES/gnomeicu.mo
-share/locale/sr@Latn/LC_MESSAGES/gnomeicu.mo
-share/locale/sv/LC_MESSAGES/gnomeicu.mo
-share/locale/th/LC_MESSAGES/gnomeicu.mo
-share/locale/tr/LC_MESSAGES/gnomeicu.mo
-share/locale/uk/LC_MESSAGES/gnomeicu.mo
-share/locale/vi/LC_MESSAGES/gnomeicu.mo
-share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo
-share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
-@dirrm share/gnome/sounds/gnomeicu
-@dirrm share/gnome/omf/gnomeicu
-@dirrm share/gnome/help/gnomeicu/uk/figures
-@dirrm share/gnome/help/gnomeicu/uk
-@dirrm share/gnome/help/gnomeicu/C/figures
-@dirrm share/gnome/help/gnomeicu/C
-@dirrm share/gnome/help/gnomeicu
-@dirrm share/gnome/gnomeicu/icons/reDubbed
-@dirrm share/gnome/gnomeicu/icons/Gradients
-@dirrm share/gnome/gnomeicu/icons/Eyeballs
-@dirrm share/gnome/gnomeicu/icons/Default
-@dirrm share/gnome/gnomeicu/icons
-@dirrm share/gnome/gnomeicu/glade
-@dirrm share/gnome/gnomeicu/emoticons/Yahoo
-@dirrm share/gnome/gnomeicu/emoticons/MSN
-@dirrm share/gnome/gnomeicu/emoticons/Default
-@dirrm share/gnome/gnomeicu/emoticons/Always
-@dirrm share/gnome/gnomeicu/emoticons/AIM
-@dirrm share/gnome/gnomeicu/emoticons
-@dirrm share/gnome/gnomeicu
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq/network
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq/color
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/themes
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/status
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/files
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/events
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/connections
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq/network
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq/color
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/themes
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/status
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/files
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/events
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/connections
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomeicu/gnomeicu-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomeicu/gnomeicu-uk.omf 2>/dev/null || /usr/bin/true
diff --git a/net/gnomenettool/Makefile b/net/gnomenettool/Makefile
deleted file mode 100644
index 75eec38b0530..000000000000
--- a/net/gnomenettool/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:   gnomenetwork
-# Date Created:			03 June 2003
-# Whom:				Adam Weinberger <adamw@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomenetwork
-PORTVERSION=	1.99.5
-PORTREVISION=	3
-CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-network/1.99
-DISTNAME=	gnome-network-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A library for writing networked servers & clients
-
-USE_X_PREFIX=	yes
-USE_BZIP2=	yes
-USE_GNOME=	gnomehack gnomeprefix libgnomeui
-USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
-CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-post-patch:
-	${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \
-		 s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";|'
-
-.include <bsd.port.mk>
diff --git a/net/gnomenettool/distinfo b/net/gnomenettool/distinfo
deleted file mode 100644
index 10a870525cae..000000000000
--- a/net/gnomenettool/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/gnome-network-1.99.5.tar.bz2) = 77532442a106d06ed2fe015f87d9b522
-SIZE (gnome2/gnome-network-1.99.5.tar.bz2) = 660804
diff --git a/net/gnomenettool/files/patch-configure b/net/gnomenettool/files/patch-configure
deleted file mode 100644
index f195f07b43c6..000000000000
--- a/net/gnomenettool/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed Dec 11 18:31:51 2002
-+++ configure	Thu Dec 12 12:07:17 2002
-@@ -7414,6 +7414,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net/gnomenettool/files/patch-gnome-netinfo::info.c b/net/gnomenettool/files/patch-gnome-netinfo::info.c
deleted file mode 100644
index 54c795546c31..000000000000
--- a/net/gnomenettool/files/patch-gnome-netinfo::info.c
+++ /dev/null
@@ -1,63 +0,0 @@
---- gnome-netinfo/info.c.orig	Mon Nov 24 18:29:43 2003
-+++ gnome-netinfo/info.c	Wed Dec 17 22:27:46 2003
-@@ -27,6 +27,7 @@
- #endif
- 
- 
-+#include <netinet/in.h>
- #include <sys/socket.h>	/* basic socket definitions */
- #include <arpa/inet.h>	/* inet(3) functions */
- #include <sys/un.h>	/* for Unix domain sockets */
-@@ -173,7 +174,7 @@
- 	for (ptr = buf; ptr < buf + ifc.ifc_len;) {
- 		ifr = (struct ifreq *) ptr;
- 		len = sizeof (struct sockaddr);
--#ifdef	HAVE_SOCKADDR_SA_LEN
-+#if	defined(HAVE_SOCKADDR_SA_LEN) || defined(__FreeBSD__)
- 		if (ifr->ifr_addr.sa_len > len)
- 			len = ifr->ifr_addr.sa_len;	/* length > 16 */
- #endif
-@@ -182,8 +183,12 @@
- 		if (strcmp (ifr->ifr_name, nic) != 0) {
- 			continue;
- 		}
-+
-+		memset (&data, 0, sizeof(data));
- 		
-+#ifdef __linux__
- 		data = mii_get_basic (nic);
-+#endif
- 		
- 		switch (ifr->ifr_addr.sa_family) {
- 		case AF_INET:
-@@ -306,7 +311,6 @@
- 			break;
- 		}
- 	}
--	g_free (ifr);
- }
- 
- static GList *
-@@ -321,6 +325,8 @@
- 
- 	sockfd = socket (AF_INET, SOCK_DGRAM, 0);
- 
-+	memset (&ifc, 0, sizeof (struct ifconf));
-+	memset (&buf, 0, sizeof (buf));
- 	ifc.ifc_len = sizeof (buf);
- 	ifc.ifc_req = (struct ifreq *) buf;
- 
-@@ -331,9 +337,11 @@
- 		len = sizeof (struct sockaddr);
- 
- 		iface = g_strdup (ifr->ifr_name);
--		items = g_list_append (items, iface);
-+		if (g_list_find_custom (items, iface, (GCompareFunc) g_ascii_strcasecmp) == NULL) {
-+			items = g_list_append (items, iface);
-+		}
- 
--#ifdef	HAVE_SOCKADDR_SA_LEN
-+#if defined(HAVE_SOCKADDR_SA_LEN) || defined(__FreeBSD__)
- 		if (ifr->ifr_addr.sa_len > len)
- 			len = ifr->ifr_addr.sa_len;	/* length > 16 */
- #endif
diff --git a/net/gnomenettool/files/patch-gnome-netinfo_callbacks.c b/net/gnomenettool/files/patch-gnome-netinfo_callbacks.c
deleted file mode 100644
index 32d818c6f24a..000000000000
--- a/net/gnomenettool/files/patch-gnome-netinfo_callbacks.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-netinfo/callbacks.c.orig	Sat Dec  6 23:20:05 2003
-+++ gnome-netinfo/callbacks.c	Sat Dec  6 23:20:14 2003
-@@ -27,6 +27,7 @@
- #include <sys/wait.h>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <signal.h>
- 
- #include "callbacks.h"
- #include "traceroute.h"
diff --git a/net/gnomenettool/files/patch-gnome-netinfo_netinfo.c b/net/gnomenettool/files/patch-gnome-netinfo_netinfo.c
deleted file mode 100644
index 4048c43b48ab..000000000000
--- a/net/gnomenettool/files/patch-gnome-netinfo_netinfo.c
+++ /dev/null
@@ -1,41 +0,0 @@
---- gnome-netinfo/netinfo.c.orig	Mon Nov 24 18:29:43 2003
-+++ gnome-netinfo/netinfo.c	Sun Dec  7 01:00:52 2003
-@@ -20,6 +20,7 @@
- 
- #include <gnome.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
- #include <signal.h>
- #include <errno.h>
- #include <sys/wait.h>
-@@ -253,14 +254,16 @@
- 	if (condition & G_IO_IN) {
- 		g_io_channel_read_line (channel, &text, &len, NULL, NULL);
- 
--		if (netinfo->process_line != NULL) {
--			(netinfo->process_line) ((gpointer) netinfo, text,
--						 len, NULL);
--		}
-+		if (text != NULL) {
-+			if (netinfo->process_line != NULL) {
-+				(netinfo->process_line) ((gpointer) netinfo, text,
-+						 	len, NULL);
-+			}
- 
--		g_free (text);
-+			g_free (text);
- 
--		return TRUE;
-+			return TRUE;
-+		}
- 	}
- 
- 	/* The condition is not G_IO_HUP | G_IO_ERR | G_IO_NVAL, so
-@@ -285,6 +288,7 @@
- 	}
- 	return FALSE;
- }
-+
- 
- void
- netinfo_stop_process_command (Netinfo * netinfo)
diff --git a/net/gnomenettool/files/patch-gnome-netinfo_netstat.c b/net/gnomenettool/files/patch-gnome-netinfo_netstat.c
deleted file mode 100644
index 4f0a7240ba9c..000000000000
--- a/net/gnomenettool/files/patch-gnome-netinfo_netstat.c
+++ /dev/null
@@ -1,136 +0,0 @@
---- gnome-netinfo/netstat.c.orig	Mon Nov 24 18:29:43 2003
-+++ gnome-netinfo/netstat.c	Sun Dec  7 01:34:51 2003
-@@ -113,7 +113,11 @@
- 	}
- 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->protocol))) {
- 		/* Only works for Solaris */
-+#ifdef __FreeBSD__
-+	    	option = g_strdup ("-a -f inet -ln");
-+#else
- 		option = g_strdup ("-A inet -ln");
-+#endif
- 	}
- 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->multicast))) {
- 		/* It works for Solaris and Linux */
-@@ -266,7 +270,11 @@
- 	g_return_if_fail (line != NULL);
- 
- 	count = strip_protocol_line (line, &data);
-+#ifdef __FreeBSD__
-+	if (count == 5 || count == 6 || count == 9 || count == 10) {
-+#else
- 	if (count == 7 || count == 8) {
-+#endif
- #ifdef DEBUG
- 		g_print ("%s\t%s:%s\t%s\n", data.protocol,
- 			data.ip_src, data.port_src, data.state);
-@@ -331,11 +339,42 @@
- strip_protocol_line (gchar * line, netstat_protocol_data *data)
- {
- 	gint count = 0;
-+#ifdef __FreeBSD__
-+	gint a1, a2, a3, a4;
-+	gchar s9[30];
-+#else
- 	gchar s6[30], s7[30];
-+#endif
- 	gint n2, n3;
- 
- 	line = g_strdelimit (line, ":", ' ');
- 
-+#ifdef __FreeBSD__
-+	count = sscanf (line, NETSTAT_PROTOCOL_FORMAT,
-+			data->protocol, &n2, &n3,
-+			&a1, &a2, &a3, &a4, data->port_src,
-+			s9, data->state);
-+	g_snprintf (data->ip_src, 30, "%d.%d.%d.%d", a1, a2, a3, a4);
-+
-+	if (count == 9) {
-+	    bzero (&(data)->state, 30);
-+	}
-+
-+	if (count == 3) {
-+	    /* Handle the *.* entries. */
-+	    gchar s5[30];
-+	    count = sscanf (line, ALT_NETSTAT_PROTOCOL_FORMAT,
-+		    	    data->protocol, &n2, &n3,
-+			    data->port_src, s5,
-+			    data->state);
-+	    g_snprintf (data->ip_src, 30, "*");
-+
-+	    if (count == 5) {
-+		bzero (&(data)->state, 30);
-+	    }
-+	}
-+
-+#else
- 	count = sscanf (line, NETSTAT_PROTOCOL_FORMAT,
- 			data->protocol, &n2, &n3,
- 			data->ip_src, data->port_src, 
-@@ -344,6 +383,7 @@
- 	if (count == 7) {
- 		bzero (&(data)->state, 30);
- 	}
-+#endif
- 	
- 	return count;
- }
-@@ -405,7 +445,11 @@
- 	g_return_if_fail (line != NULL);
- 
- 	count = strip_route_line (line, &data);
-+#ifdef __FreeBSD__
-+	if (count == 6) {
-+#else
- 	if (count == 8) {
-+#endif
- #ifdef DEBUG
- 		g_print ("%s\t%s:%s\t%d\t%s\n", data.destination,
- 			data.gateway, data.netmask, data.metric,
-@@ -474,11 +518,19 @@
- 	gchar flags[30];
- 	gint ref, use;
- 
-+#ifdef __FreeBSD__
-+	count = sscanf (line, NETSTAT_ROUTE_FORMAT,
-+			data->destination,
-+			data->gateway, flags,
-+			&ref, &use, data->iface);
-+#else
-+
- 	count = sscanf (line, NETSTAT_ROUTE_FORMAT,
- 			data->destination,
- 			data->gateway, data->netmask, 
- 			flags, &(data)->metric, &ref, &use, 
- 			data->iface);
-+#endif
- 	
- 	return count;
- }
-@@ -493,7 +545,11 @@
- 	renderer = gtk_cell_renderer_text_new ();
- 	column =
- 	    gtk_tree_view_column_new_with_attributes
-+#ifdef __FreeBSD__
-+	    (_("Destination/Prefix"), renderer, "text", 0, NULL);
-+#else
- 	    (_("Destination"), renderer, "text", 0, NULL);
-+#endif
- 	gtk_tree_view_append_column (widget, column);
- 
- 	renderer = gtk_cell_renderer_text_new ();
-@@ -503,12 +559,14 @@
- 	gtk_tree_view_column_set_alignment (column, 0.5);
- 	gtk_tree_view_append_column (widget, column);
- 
-+#ifndef __FreeBSD__
- 	renderer = gtk_cell_renderer_text_new ();
- 	column =
- 	    gtk_tree_view_column_new_with_attributes
- 	    (_("Netmask"), renderer, "text", 2, NULL);
- 		
- 	gtk_tree_view_append_column (widget, column);
-+#endif
- 
- 	renderer = gtk_cell_renderer_text_new ();
- 	column =
diff --git a/net/gnomenettool/files/patch-gnome-netinfo_netstat.h b/net/gnomenettool/files/patch-gnome-netinfo_netstat.h
deleted file mode 100644
index 6e00ba018f0b..000000000000
--- a/net/gnomenettool/files/patch-gnome-netinfo_netstat.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- gnome-netinfo/netstat.h.orig	Sun Jul 20 22:31:57 2003
-+++ gnome-netinfo/netstat.h	Sun Dec  7 01:32:10 2003
-@@ -28,6 +28,11 @@
- #   define NETSTAT_PROTOCOL_FORMAT "%s %d %d %s %s %s %s %s" 
- #   define NETSTAT_ROUTE_FORMAT "%s %s %s %s %d %d %d %s" 
- #   define NETSTAT_MULTICAST_FORMAT "%s %d %s" 
-+#elif defined(__FreeBSD__)
-+#   define NETSTAT_PROTOCOL_FORMAT "%s %d %d %d.%d.%d.%d.%s %s %s"
-+#   define ALT_NETSTAT_PROTOCOL_FORMAT "%s %d %d *.%s %s %s"
-+#   define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s"
-+#   define NETSTAT_MULTICAST_FORMAT "%s %d %s"
- 
- #endif
- 
diff --git a/net/gnomenettool/files/patch-gnome-netinfo_ping.c b/net/gnomenettool/files/patch-gnome-netinfo_ping.c
deleted file mode 100644
index 40f2b83fa6b1..000000000000
--- a/net/gnomenettool/files/patch-gnome-netinfo_ping.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-netinfo/ping.c.orig	Sat Dec  6 23:08:52 2003
-+++ gnome-netinfo/ping.c	Sat Dec  6 23:17:35 2003
-@@ -330,6 +330,8 @@
- 
- 	if (netinfo_get_ip_version (netinfo) == IPV4)
- 		line = g_strdelimit (line, ":", ' ');
-+	else
-+	    	line = g_strdelimit (line, ",", ' ');
- 
- #ifdef PING_PARAMS_5
- 	count = sscanf (line, PING_FORMAT,
diff --git a/net/gnomenettool/files/patch-gnome-netinfo_ping.h b/net/gnomenettool/files/patch-gnome-netinfo_ping.h
deleted file mode 100644
index debf4603d263..000000000000
--- a/net/gnomenettool/files/patch-gnome-netinfo_ping.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-netinfo/ping.h.orig	Sat Dec  6 23:11:01 2003
-+++ gnome-netinfo/ping.h	Sat Dec  6 23:17:53 2003
-@@ -25,7 +25,7 @@
- 
- /* The ping usage and output is different between Unix flavours */
- /* FIXME: Add BSD support */
--#if defined(__linux__) || defined(__OSF__)
-+#if defined(__linux__) || defined(__OSF__) || defined(__FreeBSD__)
- #   define PING_PROGRAM_FORMAT "%s ping -c %d -n %s"
- #   define PING_PROGRAM_FORMAT_6 "%s ping6 -c %d -n %s"
- #   define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
diff --git a/net/gnomenettool/files/patch-gnome-netinfo_util-mii.c b/net/gnomenettool/files/patch-gnome-netinfo_util-mii.c
deleted file mode 100644
index 9d38a3d3daa6..000000000000
--- a/net/gnomenettool/files/patch-gnome-netinfo_util-mii.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- gnome-netinfo/util-mii.c.orig	Sat Dec  6 23:30:50 2003
-+++ gnome-netinfo/util-mii.c	Sat Dec  6 23:38:14 2003
-@@ -39,6 +39,7 @@
-  * http://www.national.com/pf/DP/DP83840.html
-  */
- 
-+#ifdef __linux__
- #include <glib.h>
- 
- #include <errno.h>
-@@ -237,3 +238,4 @@
- 	close (sock);
- 	return data;
- }
-+#endif
diff --git a/net/gnomenettool/files/patch-network-utilities_gnome-remote-shell.c b/net/gnomenettool/files/patch-network-utilities_gnome-remote-shell.c
deleted file mode 100644
index 0ac22218e1ab..000000000000
--- a/net/gnomenettool/files/patch-network-utilities_gnome-remote-shell.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- network-utilities/gnome-remote-shell.c.orig	Mon Sep  1 01:56:21 2003
-+++ network-utilities/gnome-remote-shell.c	Mon Sep  1 01:58:11 2003
-@@ -23,6 +23,9 @@
- #endif
- 
- #include <netdb.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
- #include <gconf/gconf-client.h>
- #include <gtk/gtkdialog.h>
- #include <gtk/gtkentry.h>
diff --git a/net/gnomenettool/pkg-descr b/net/gnomenettool/pkg-descr
deleted file mode 100644
index 1362640b6f11..000000000000
--- a/net/gnomenettool/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-gnome-network is a set of network oriented user tools. It includes the
-following tools:
-
-        * gnome-remote-shell: a remote shell (Telnet/SSH) client.
-        * gnome-remote-desktop: a remote desktop (X11/VNC) client.
-        * gnome-netinfo: a network information tool, for getting info on
-          network cards, DNS, etc.
-        * gnome-backup: a backup client tool.
-
-WWW: http://www.gnome.org/
diff --git a/net/gnomenettool/pkg-plist b/net/gnomenettool/pkg-plist
deleted file mode 100644
index 5c7e7394dfcc..000000000000
--- a/net/gnomenettool/pkg-plist
+++ /dev/null
@@ -1,56 +0,0 @@
-bin/gnome-remote-shell
-bin/gnome-remote-desktop
-bin/gnome-netinfo
-share/gnome/application-registry/gnome-remote-desktop.applications
-share/gnome/applications/gnome-network-utilities.desktop
-share/gnome/applications/gnome-netinfo.desktop
-share/gnome/apps/Internet/gnome-remote-desktop.desktop
-share/gnome/gnome-network/dialogs/gnome-netinfo.glade
-share/gnome/gnome-network/dialogs/gnome-remote-shell.glade
-share/gnome/mime-info/gnome-remote-desktop.keys
-share/gnome/mime-info/gnome-remote-desktop.mime
-share/gnome/pixmaps/gnome-netinfo.png
-share/gnome/pixmaps/gnome-network/colors.png
-share/gnome/pixmaps/gnome-network/computer.png
-share/gnome/pixmaps/gnome-network/gnome-remote-desktop.png
-share/gnome/pixmaps/gnome-network/keyboard.png
-share/gnome/pixmaps/gnome-network/perform.png
-share/gnome/pixmaps/gnome-network/program.png
-share/gnome/pixmaps/gnome-network/size.png
-share/gnome/pixmaps/gnome-network/sound.png
-share/gnome/pixmaps/gnome-remote-desktop.png
-share/gnome/pixmaps/gnome-remote-shell.png
-share/locale/az/LC_MESSAGES/gnome-network.mo
-share/locale/ca/LC_MESSAGES/gnome-network.mo
-share/locale/cs/LC_MESSAGES/gnome-network.mo
-share/locale/da/LC_MESSAGES/gnome-network.mo
-share/locale/de/LC_MESSAGES/gnome-network.mo
-share/locale/el/LC_MESSAGES/gnome-network.mo
-share/locale/es/LC_MESSAGES/gnome-network.mo
-share/locale/fr/LC_MESSAGES/gnome-network.mo
-share/locale/ga/LC_MESSAGES/gnome-network.mo
-share/locale/gl/LC_MESSAGES/gnome-network.mo
-share/locale/he/LC_MESSAGES/gnome-network.mo
-share/locale/hu/LC_MESSAGES/gnome-network.mo
-share/locale/it/LC_MESSAGES/gnome-network.mo
-share/locale/ja/LC_MESSAGES/gnome-network.mo
-share/locale/ko/LC_MESSAGES/gnome-network.mo
-share/locale/ms/LC_MESSAGES/gnome-network.mo
-share/locale/nl/LC_MESSAGES/gnome-network.mo
-share/locale/no/LC_MESSAGES/gnome-network.mo
-share/locale/pl/LC_MESSAGES/gnome-network.mo
-share/locale/pt/LC_MESSAGES/gnome-network.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-network.mo
-share/locale/ru/LC_MESSAGES/gnome-network.mo
-share/locale/sr/LC_MESSAGES/gnome-network.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-network.mo
-share/locale/sv/LC_MESSAGES/gnome-network.mo
-share/locale/tr/LC_MESSAGES/gnome-network.mo
-share/locale/uk/LC_MESSAGES/gnome-network.mo
-share/locale/vi/LC_MESSAGES/gnome-network.mo
-share/locale/wa/LC_MESSAGES/gnome-network.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-network.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-network.mo
-@dirrm share/gnome/pixmaps/gnome-network
-@dirrm share/gnome/gnome-network/dialogs
-@dirrm share/gnome/gnome-network
diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
deleted file mode 100644
index c1b494546213..000000000000
--- a/net/haproxy-devel/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# New ports collection Makefile for:	haproxy
-# Date created:				Apr 30, 2003
-# Whom:					Clement Laforet
-#
-# $FreeBSD$
-#
-
-PORTNAME=	haproxy
-PORTVERSION=	1.1.27
-CATEGORIES=	net www
-MASTER_SITES=	http://w.ods.org/tools/haproxy/src/ \
-		http://w.ods.org/tools/haproxy/src/old/
-
-MAINTAINER=	clement@FreeBSD.org
-COMMENT=	High-performance and highly-robust TCP/HTTP load balancer
-
-USE_REINPLACE=	yes
-
-STATS_INTERVAL?=	0
-CFLAGS+=	-DSTATTIME=${STATS_INTERVAL}
-
-.if defined(WITH_TPROXY)
-CFLAGS+=	-DTPROXY
-.endif
-
-.if defined(WITH_PCRE)
-PKGNAMESUFFIX=	-pcre
-LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-CFLAGS+=	-DUSE_PCRE -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lpcreposix -lpcre
-.endif
-
-pre-fetch:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Available options:"
-	@${ECHO_MSG} "WITH_PCRE:            Use pcre regex engine"
-	@${ECHO_MSG} "WITH_DTPROXY:         Enable Transparent proxy support"
-	@${ECHO_MSG} "STATS_INTERVAL=###:   Statistics interval in milliseconds,"
-	@${ECHO_MSG} "                         (default to 0, disabled)"
-	@${ECHO_MSG} ""
-
-post-patch:
-	@${REINPLACE_CMD} -e 's!localtime(!localtime((time_t *)!' ${WRKSRC}/haproxy.c
-
-do-build:
-	cd ${WRKSRC} && ${CC} ${CFLAGS} ${LDFLAGS} ${PORTNAME}.c -o ${PORTNAME}
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin
-	@${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg \
-			${PREFIX}/etc/haproxy.cfg.sample
-	@${INSTALL_SCRIPT} ${FILESDIR}/haproxy.sh \
-			${PREFIX}/etc/rc.d/haproxy.sh.sample
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/haproxy-devel/distinfo b/net/haproxy-devel/distinfo
deleted file mode 100644
index 910ba848f648..000000000000
--- a/net/haproxy-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (haproxy-1.1.27.tar.gz) = 8379ebfc91a5fbf1f49ca65e36b460af
-SIZE (haproxy-1.1.27.tar.gz) = 90455
diff --git a/net/haproxy-devel/files/haproxy.sh b/net/haproxy-devel/files/haproxy.sh
deleted file mode 100644
index e51b6a855662..000000000000
--- a/net/haproxy-devel/files/haproxy.sh
+++ /dev/null
@@ -1,22 +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/haproxy ] && \
-        	[ -r ${PREFIX}/etc/haproxy.cfg ] && \
-        	${PREFIX}/sbin/haproxy -f ${PREFIX}/etc/haproxy.cfg  && \
-                        echo -n ' haproxy'
-
-	;;
-	stop)
-	killall haproxy && echo -n ' haproxy'
-	;;
-	*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
diff --git a/net/haproxy-devel/pkg-descr b/net/haproxy-devel/pkg-descr
deleted file mode 100644
index fa6780fd9794..000000000000
--- a/net/haproxy-devel/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-HAproxy is a high-performance and highly-robust TCP/HTTP load balancer which 
-provides cookie-based persistence, automatic failover, header insertion, 
-deletion, modification on the fly, advanced logging contents to help trouble- 
-shooting buggy applications and/or networks, and a few other features. It uses 
-its own state machine to achieve up to ten thousands hits per second on modern 
-hardware, even with thousands simultaneous connections. It currently lacks SSL 
-and keep-alive, both of which are planned.
-
-WWW: http://w.ods.org/tools/haproxy/
diff --git a/net/haproxy-devel/pkg-plist b/net/haproxy-devel/pkg-plist
deleted file mode 100644
index fd8b17619ca1..000000000000
--- a/net/haproxy-devel/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-sbin/haproxy
-etc/haproxy.cfg.sample
-etc/rc.d/haproxy.sh.sample
-%%PORTDOCS%%%%DOCSDIR%%/haproxy-en.txt
-%%PORTDOCS%%%%DOCSDIR%%/haproxy-fr.txt
-@dirrm %%DOCSDIR%%
diff --git a/net/hping/Makefile b/net/hping/Makefile
deleted file mode 100644
index db529bea3ce0..000000000000
--- a/net/hping/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# New ports collection makefile for:	hping
-# Date Created:				5 Oct 2000
-# Whom:					Roman Shterenzon <roman@xpert.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	hping
-PORTVERSION=	2.0.0r2
-PORTREVISION=	3
-PORTEPOCH=	1
-CATEGORIES=	security net
-MASTER_SITES=	http://www.hping.org/
-DISTNAME=	hping2.0.0-rc2
-
-MAINTAINER=	ecu@ipv42.net
-COMMENT=	Network auditing tool
-
-WRKSRC=		${WRKDIR}/hping2-rc2
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--force-libpcap
-USE_GMAKE=	yes
-
-PLIST_FILES=	sbin/hping
-PORTDOCS=	AS-BACKDOOR HPING2-HOWTO.txt HPING2-IS-OPEN \
-		MORE-FUN-WITH-IPID SPOOFED_SCAN.txt
-
-MAN8=	hping.8
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hping2 ${PREFIX}/sbin/hping
-	${INSTALL_MAN} ${WRKSRC}/docs/hping2.8 ${PREFIX}/man/man8/hping.8
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/docs/${i} ${DOCSDIR}/
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/hping/distinfo b/net/hping/distinfo
deleted file mode 100644
index 1bdf7183c989..000000000000
--- a/net/hping/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (hping2.0.0-rc2.tar.gz) = f9ab1f84ec89f2a1c428988231d554b0
-SIZE (hping2.0.0-rc2.tar.gz) = 100501
diff --git a/net/hping/files/patch-Makefile.in b/net/hping/files/patch-Makefile.in
deleted file mode 100644
index 07e0dd9d3ddc..000000000000
--- a/net/hping/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Wed Aug 15 04:02:53 2001
-+++ Makefile.in	Mon Nov 18 09:10:12 2002
-@@ -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= -Wall @CFLAGS@ @PCAP_INCLUDE@
- DEBUG= -g
- #uncomment the following if you need libpcap based build under linux
- #(not raccomanded)
diff --git a/net/hping/files/patch-configure b/net/hping/files/patch-configure
deleted file mode 100644
index b7dda57f7370..000000000000
--- a/net/hping/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Fri Sep 14 22:04:25 2001
-+++ configure	Fri Sep 14 22:05:02 2001
-@@ -99,6 +99,7 @@
- 	-e "s^@PCAP_INCLUDE@^$PCAP_INCLUDE^g" \
- 	-e "s^@MANPATH@^$INSTALL_MANPATH^g" \
- 	-e "s^@SOLARISLIB@^$SOLARISLIB^g" \
-+	-e "s^@CFLAGS@^$CFLAGS^g" \
- 	<Makefile.in > Makefile
- 
- #
diff --git a/net/hping/files/patch-memlockall b/net/hping/files/patch-memlockall
deleted file mode 100644
index e613a3f17a22..000000000000
--- a/net/hping/files/patch-memlockall
+++ /dev/null
@@ -1,11 +0,0 @@
---- memlockall.c.orig	Sun Nov 17 18:04:44 2002
-+++ memlockall.c	Sun Nov 17 18:04:43 2002
-@@ -13,7 +13,7 @@
- 
- int memlockall(void)
- {
--#ifdef _POSIX_MEMLOCK
-+#if _POSIX_MEMLOCK == 1
- 	return ( mlockall(MCL_CURRENT|MCL_FUTURE) );
- #endif
- 	return (-1);
diff --git a/net/hping/files/patch-memunlockall b/net/hping/files/patch-memunlockall
deleted file mode 100644
index 4a67466433f7..000000000000
--- a/net/hping/files/patch-memunlockall
+++ /dev/null
@@ -1,11 +0,0 @@
---- memunlockall.c.orig	Sun Nov 17 18:04:44 2002
-+++ memunlockall.c	Sun Nov 17 18:04:43 2002
-@@ -13,7 +13,7 @@
- 
- int memunlockall(void)
- {
--#ifdef _POSIX_MEMLOCK
-+#if _POSIX_MEMLOCK == 1
- 	return ( munlockall() );
- #endif
- 	return(-1);
diff --git a/net/hping/files/patch-warnings b/net/hping/files/patch-warnings
deleted file mode 100644
index 4ded8a219920..000000000000
--- a/net/hping/files/patch-warnings
+++ /dev/null
@@ -1,145 +0,0 @@
-*** datafiller.c.org	Sun Mar 30 13:18:24 2003
---- datafiller.c	Sun Mar 30 13:20:22 2003
-***************
-*** 14,19 ****
---- 14,20 ----
-  #include <sys/stat.h>
-  #include <fcntl.h>
-  #include <string.h> /* memset */
-+ #include <stdlib.h>
-  
-  #include "hping2.h"
-  #include "globals.h"
-
-
-*** libpcap_stuff.c.org	Sun Mar 30 13:19:42 2003
---- libpcap_stuff.c	Sun Mar 30 13:25:51 2003
-***************
-*** 17,22 ****
---- 17,23 ----
-  #include <sys/ioctl.h>
-  #include <pcap.h>
-  #include <net/bpf.h>
-+ #include <string.h>
-  
-  #include "globals.h"
-
-  
-*** listen.c.org	Sun Mar 30 13:19:24 2003
---- listen.c	Sun Mar 30 13:24:31 2003
-***************
-*** 14,19 ****
---- 14,20 ----
-  #include <sys/types.h>
-  #include <sys/socket.h>
-  #include <netinet/in.h>
-+ #include <stdlib.h>
-  
-  #include "hping2.h" /* hping2.h includes hcmp.h */
-  #include "globals.h"
-
-
-*** resolve.c.org	Sun Mar 30 13:18:51 2003
---- resolve.c	Sun Mar 30 13:22:02 2003
-***************
-*** 15,20 ****
---- 15,21 ----
-  #include <sys/socket.h>
-  #include <netinet/in.h>
-  #include <arpa/inet.h>
-+ #include <stdlib.h>
-  
-  void resolve (struct sockaddr * addr, char *hostname)
-  {
-
-
-*** rtt.c.org	Sun Mar 30 13:19:33 2003
---- rtt.c	Mon Mar 31 17:32:40 2003
-***************
-*** 72,82 ****
-  		printf("\n\nSANITY CHECK in rtt.c FAILED!\n");
-  		printf("- seqnum = %d\n", *seqp);
-  		printf("- status = %d\n", status);
-! 		printf("- get_usec() = %ld\n", get_usec());
-! 		printf("- delaytable.usec = %ld\n", delaytable[tablepos].usec);
-! 		printf("- usec_delay = %ld\n", usec_delay);
-! 		printf("- time(NULL) = %ld\n", time(NULL));
-! 		printf("- delaytable.sec = %ld\n", delaytable[tablepos].sec);
-  		printf("- sec_delay = %ld\n", sec_delay);
-  		printf("- ms_delay = %f\n", *ms_delay);
-  		printf("END SANITY CHECK REPORT\n\n");
---- 72,83 ----
-  		printf("\n\nSANITY CHECK in rtt.c FAILED!\n");
-  		printf("- seqnum = %d\n", *seqp);
-  		printf("- status = %d\n", status);
-! 		/* time_t is __int32_t on i386 FreeBSD */
-! 		printf("- get_usec() = %ld\n", (long)get_usec());
-! 		printf("- delaytable.usec = %ld\n", (long)delaytable[tablepos].usec);
-! 		printf("- usec_delay = %ld\n", (long)usec_delay);
-! 		printf("- time(NULL) = %ld\n", (long)time(NULL));
-! 		printf("- delaytable.sec = %ld\n", (long)delaytable[tablepos].sec);
-  		printf("- sec_delay = %ld\n", sec_delay);
-  		printf("- ms_delay = %f\n", *ms_delay);
-  		printf("END SANITY CHECK REPORT\n\n");
-
-
-*** statistics.c.org	Sun Mar 30 13:19:02 2003
---- statistics.c	Sun Mar 30 13:22:18 2003
-***************
-*** 9,14 ****
---- 9,15 ----
-   */ 
-  
-  #include <stdio.h>
-+ #include <stdlib.h>
-  
-  #include "hping2.h"
-  #include "globals.h"
-
-
-*** version.c.org	Sun Mar 30 13:19:17 2003
---- version.c	Sun Mar 30 13:23:17 2003
-***************
-*** 9,14 ****
---- 9,15 ----
-   */ 
-  
-  #include <stdio.h>
-+ #include <stdlib.h>
-  
-  #include "release.h"
-  #include "hping2.h"
-
-
-*** waitpacket.c.org	Sun Mar 30 13:18:32 2003
---- waitpacket.c	Sun Mar 30 20:28:13 2003
-***************
-*** 13,18 ****
---- 13,19 ----
-  #include <time.h>
-  #include <ctype.h>
-  #include <unistd.h>
-+ #include <stdlib.h>
-  
-  #include "hping2.h"
-  #include "globals.h"
-
-*** waitpacket.c.org	Sun Mar 30 13:18:32 2003
---- waitpacket.c	Sun Mar 30 20:28:13 2003
-***************
-*** 179,185 ****
-  		(unsigned int) ntohl(icmp_tstamp.orig),
-  		(unsigned int) ntohl(icmp_tstamp.recv),
-  		(unsigned int) ntohl(icmp_tstamp.tran));
-! 	printf("ICMP timestamp RTT tsrtt=%lu\n\n",
-  		(get_midnight_ut_ms() - ntohl(icmp_tstamp.orig)));
-  }
-  
---- 180,186 ----
-  		(unsigned int) ntohl(icmp_tstamp.orig),
-  		(unsigned int) ntohl(icmp_tstamp.recv),
-  		(unsigned int) ntohl(icmp_tstamp.tran));
-! 	printf("ICMP timestamp RTT tsrtt=%u\n\n",
-  		(get_midnight_ut_ms() - ntohl(icmp_tstamp.orig)));
-  }
-  
diff --git a/net/hping/pkg-descr b/net/hping/pkg-descr
deleted file mode 100644
index d62dcd7dddbf..000000000000
--- a/net/hping/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-hping is a command-line oriented TCP/IP packet assembler/analyzer. 
-The interface is inspired to the ping(8) unix command, but hping isn't 
-only able to send ICMP echo requests. It supports TCP, UDP, ICMP and 
-RAW-IP protocols, has a traceroute mode, the ability to send files 
-between a covered channel, and many other features. 
-While hping was mainly used as a security tool in the past, it can be 
-used in many ways by people that don't care about security to test 
-networks and hosts. A subset of the stuff you can do using hping:
- 
-	- 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.
-
-WWW: http://www.hping.org/
-
--- Nicolas Jombart <ecu@ipv42.net>
diff --git a/net/imm/Makefile b/net/imm/Makefile
deleted file mode 100644
index 942d9af704bc..000000000000
--- a/net/imm/Makefile
+++ /dev/null
@@ -1,49 +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
-COMMENT=	Internet Image(or other data) Multicaster (and receiver)
-
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-
-WRKSRC=		${WRKDIR}/mnm
-USE_X_PREFIX=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile on FreeBSD ${OSVERSION}"
-.endif
-
-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.post.mk>
diff --git a/net/imm/distinfo b/net/imm/distinfo
deleted file mode 100644
index b1bff9932c7c..000000000000
--- a/net/imm/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (imm.source.tar.Z) = bf2713e5dca81daaecbc0bbcaf7af667
-SIZE (imm.source.tar.Z) = 106067
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-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/isc-dhcp30-client/Makefile b/net/isc-dhcp30-client/Makefile
deleted file mode 100644
index 4b52a17c9736..000000000000
--- a/net/isc-dhcp30-client/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:    dhcp
-# Date created:         28 April 2003
-# Whom:                 cyrille.lefevre@laposte.net
-#
-# $FreeBSD$
-#
-
-MAINTAINER=	cyrille.lefevre@laposte.net
-COMMENT=	The ISC Dynamic Host Configuration Protocol client
-
-# Local variables
-#
-
-SUBSYS=		client
-
-# Local overrides
-#
-
-MASTERDIR=	${.CURDIR}/../isc-dhcp3-server
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/isc-dhcp30-client/pkg-descr b/net/isc-dhcp30-client/pkg-descr
deleted file mode 100644
index 7dc1bc78ea95..000000000000
--- a/net/isc-dhcp30-client/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides a
-freely redistributable reference implementation of all aspects of the
-DHCP protocol, through a suite of DHCP tools:
-
-  * A DHCP server
-  * A DHCP client (this port)
-  * A DHCP relay agent
-
-Version 3 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. 
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp30-client/pkg-message b/net/isc-dhcp30-client/pkg-message
deleted file mode 100644
index b406fd04fbd8..000000000000
--- a/net/isc-dhcp30-client/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-****  To setup dhclient, you may need to edit /etc/rc.conf to replace the
-      base system dhclient, such as :
-
-	    dhcp_program="%%PREFIX%%/sbin/dhclient"
-	    dhcp_flags="-q"
-
-      See dhclient(8), using the following command, for details about other
-      possible options:
-
-	    MANPATH=%%MAN1PREFIX%%/man man 8 dhclient
diff --git a/net/isc-dhcp30-client/pkg-plist b/net/isc-dhcp30-client/pkg-plist
deleted file mode 100644
index 24a86ac55ff0..000000000000
--- a/net/isc-dhcp30-client/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp30-client/Attic/pkg-plist,v 1.2 2004-03-05 22:03:02 sergei Exp $
-etc/dhclient.conf.sample
-@exec [ -f %D/etc/dhclient.conf ] || touch %D/etc/dhclient.conf
-@unexec [ -L %D/etc/dhclient.conf -o -s %D/etc/dhclient.conf ] || rm -f %D/etc/dhclient.conf
-sbin/dhclient
-sbin/dhclient-script
-%%PORTDOCS%%%%DOCSDIR%%/ANONCVS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec [ -f /var/run/dhclient.leases ] || touch /var/run/dhclient.leases
-@unexec [ -s /var/run/dhclient.leases ] || rm -f /var/run/dhclient.leases
diff --git a/net/isc-dhcp30-relay/Makefile b/net/isc-dhcp30-relay/Makefile
deleted file mode 100644
index e7626329f2ca..000000000000
--- a/net/isc-dhcp30-relay/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:    dhcp
-# Date created:         28 April 2003
-# Whom:                 cyrille.lefevre@laposte.net
-#
-# $FreeBSD$
-#
-
-MAINTAINER=	cyrille.lefevre@laposte.net
-COMMENT=	The ISC Dynamic Host Configuration Protocol relay
-
-# Local variables
-#
-
-SUBSYS=		relay
-
-# Local overrides
-#
-
-MASTERDIR=	${.CURDIR}/../isc-dhcp3-server
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/isc-dhcp30-relay/pkg-descr b/net/isc-dhcp30-relay/pkg-descr
deleted file mode 100644
index b764dbf45a19..000000000000
--- a/net/isc-dhcp30-relay/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides a
-freely redistributable reference implementation of all aspects of the
-DHCP protocol, through a suite of DHCP tools:
-
-  * A DHCP server
-  * A DHCP client
-  * A DHCP relay agent (this port)
-
-Version 3 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. 
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp30-relay/pkg-message b/net/isc-dhcp30-relay/pkg-message
deleted file mode 100644
index af6992fb34a5..000000000000
--- a/net/isc-dhcp30-relay/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-****  This port installs dhcp relay daemon, but don't invokes dhcrelay by
-      default. If you want to invoke dhcrelay at startup, put these lines
-      into /etc/rc.conf.
-
-	    dhcrelay_enable="YES"
-	    dhcrelay_flags=""		# command option(s)
-	    dhcrelay_servers=""		# dhcrelay server(s)
-	    dhcrelay_ifaces=""		# ethernet interface(s)
-
-****  For instance, rc.conf like variables are still read from
-      %%PREFIX%%/etc/rc.isc-dhcrelay.conf. They should be move
-      into /etc/rc.conf. Also, the dhcrelay_options variable
-      must be renamed dhcrelay_flags.
diff --git a/net/isc-dhcp30-relay/pkg-plist b/net/isc-dhcp30-relay/pkg-plist
deleted file mode 100644
index 4369b9272871..000000000000
--- a/net/isc-dhcp30-relay/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp30-relay/Attic/pkg-plist,v 1.3 2004-03-16 20:31:14 des Exp $
-etc/rc.d/isc-dhcrelay.sh
-sbin/dhcrelay
-%%PORTDOCS%%%%DOCSDIR%%/ANONCVS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
deleted file mode 100644
index 291e831481f3..000000000000
--- a/net/isc-dhcp30-server/Makefile
+++ /dev/null
@@ -1,243 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:    dhcp
-# Date created:         7 Mar 1996
-# Whom:                 se
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dhcp
-PORTVERSION=	3.0.1.r12
-PORTREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
-PKGNAMEPREFIX=	isc-
-PKGNAMESUFFIX=	3-${SUBSYS}
-DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
-
-MAINTAINER=	cyrille.lefevre@laposte.net
-COMMENT?=	The ISC Dynamic Host Configuration Protocol server
-
-USE_REINPLACE=	yes
-USE_RC_SUBR=	yes
-
-.include <bsd.port.pre.mk>
-
-# Global variables
-#
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--subsys ${SUBSYS}
-ALL_TARGET=	all.${SUBSYS}
-INSTALL_TARGET=	install.${SUBSYS}
-
-SUBSYS?=	server
-
-.if ${SUBSYS} == client
-MAN5=		dhclient.conf.5 dhclient.leases.5
-MAN8=		dhclient.8 dhclient-script.8
-.elif ${SUBSYS} == server
-MAN1=		omshell.1
-MAN5=		dhcpd.conf.5 dhcpd.leases.5
-MAN8=		dhcpd.8
-.elif ${SUBSYS} == relay
-MAN8=		dhcrelay.8
-.else
-MAN3=		dhcpctl.3 omapi.3
-.endif
-.if ${SUBSYS} != relay
-MAN5+=		dhcp-eval.5 dhcp-options.5
-.endif
-
-MSG_FILE=	${.CURDIR}/pkg-message
-DESCR=		${.CURDIR}/pkg-descr
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PLIST=		${.CURDIR}/pkg-plist
-
-# Local variables
-#
-
-# for instance, possible versions are:
-#	1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2
-# which have to become:
-#	1.2rc3pl4 (or 1.2beta3pl4), 1.2rc3 (or 1.2beta3), 1.2pl3, 1.2
-# so, the magic things are:
-VERSION=
-PATCHLEVEL=
-.if ${PORTVERSION:R:E:M[br]*} != ""
-RELEASE=	${PORTVERSION:R:R}
-VERSION=	${PORTVERSION:R:E:S/b/beta/:S/r/rc/}
-PATCHLEVEL=	pl${PORTVERSION:E}
-.elif ${PORTVERSION:E:M[br]*} != ""
-RELEASE=	${PORTVERSION:R}
-VERSION=	${PORTVERSION:E:S/b/beta/:S/r/rc/}
-.elif ${PORTVERSION:R:E} != ""
-RELEASE=	${PORTVERSION:R}
-PATCHLEVEL=	pl${PORTVERSION:E}
-.else
-RELEASE=	${PORTVERSION}
-.endif
-
-PATCH_SUBDIRS=	common minires dst omapip
-.if ${SUBSYS} == server || ${SUBSYS} == devel
-PATCH_SUBDIRS+=	dhcpctl
-.endif
-.if ${SUBSYS} != devel
-PATCH_SUBDIRS+=	${SUBSYS}
-.endif
-.if ${SUBSYS} == server
-PATCH_SUBDIRS+=	omshell
-.endif
-
-.if ${SUBSYS} == client
-BIN_FILES=	dhclient
-CONF_FILES=	dhclient.conf
-SAMP_FILES=	client/dhclient.conf
-DATA_FILES=	dhclient.leases
-.elif ${SUBSYS} == server
-BIN_FILES=	dhcpd omshell
-RC_FILES=	isc-dhcpd
-SAMP_FILES=	server/dhcpd.conf
-DATA_FILES=	dhcpd.leases
-.elif ${SUBSYS} == relay
-BIN_FILES=	dhcrelay
-RC_FILES=	isc-dhcrelay
-.endif
-DOC_FILES=	ANONCVS CHANGES COPYRIGHT README RELNOTES
-
-SAMP_SUFX=	.sample
-
-CONF_DIR=	${PREFIX}/etc
-RC_DIR=		${PREFIX}/etc/rc.d
-DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
-DATADIR=	/var/db
-
-REINPLACE_SUB=	PREFIX=${PREFIX}
-RCSCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
-PKGMESSAGE_SUB=	PREFIX=${PREFIX} MAN1PREFIX=${MAN1PREFIX}
-
-# Pre-everything
-#
-
-.if ${SUBSYS} == client && !defined(WITHOUT_INTERFACE_POLLING)
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile without interface polling support."
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_INTERFACE_POLLING=yes\""
-	@${ECHO_MSG}
-.endif
-
-# Post-extract
-#
-
-post-extract: extract-omshell
-
-extract-omshell:
-	@${MKDIR} ${WRKSRC}/omshell
-	@${MV} ${WRKSRC}/dhcpctl/omshell.? ${WRKSRC}/omshell
-	@${CP} ${FILESDIR}/omshell::Makefile.dist \
-		${WRKSRC}/omshell/Makefile.dist
-
-# Post-patch
-#
-
-post-patch: patch-scripts patch-makefile-conf \
-	    patch-makefiles-dist patch-man-pages \
-	    patch-pkgmessage patch-site-conf \
-	    patch-rc-scripts
-
-patch-scripts:
-	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${WRKSRC}/client/dhclient.conf \
-		${WRKSRC}/client/scripts/freebsd
-
-patch-site-conf:
-.if ${SUBSYS} == client && !defined(WITHOUT_INTERFACE_POLLING)
-	@${ECHO_CMD} CFLAGS += -DENABLE_POLLING_MODE >> ${WRKSRC}/site.conf
-.endif
-
-patch-makefile-conf:
-	@${REINPLACE_CMD} -e 's|^DEBUG[ 	]*=|# DEBUG ?=|g' \
-		${WRKSRC}/Makefile.conf
-
-patch-makefiles-dist:
-.for subdir in ${PATCH_SUBDIRS}
-	@${REINPLACE_CMD} -e 's|^CFLAGS[ 	]*=|CFLAGS +=|g' \
-		${WRKSRC}/${subdir}/Makefile.dist
-.endfor
-
-# temporary hack - no patch file needed for this typo.
-patch-man-pages:
-	@${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3
-
-patch-rc-scripts:
-.for f in ${RC_FILES}
-	@${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/${f}.sh${SAMP_SUFX} > ${WRKDIR}/${f}.sh
-.endfor
-
-patch-pkgmessage:
-.if ${SUBSYS} != devel
-	@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${MSG_FILE} > ${PKGMESSAGE}
-.endif
-
-# Post-install
-#
-
-post-install: strip-binary-files install-startup-files \
-	      install-doc-files install-sample-files \
-	      create-conf-files create-data-files \
-	      display-message
-
-strip-binary-files:
-.for f in ${BIN_FILES}
-.if exists(${PREFIX}/bin/${f})
-	@${STRIP_CMD} ${PREFIX}/bin/${f}
-.endif
-.if exists(${PREFIX}/sbin/${f})
-	@${STRIP_CMD} ${PREFIX}/sbin/${f}
-.endif
-.endfor
-
-install-startup-files:
-.for f in ${RC_FILES}
-	@${INSTALL_SCRIPT} ${WRKDIR}/${f}.sh ${RC_DIR}
-.endfor
-
-install-doc-files:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for f in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
-
-install-sample-files:
-.for f in ${SAMP_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${CONF_DIR}/${f:T}${SAMP_SUFX}
-.endfor
-
-create-conf-files:
-.for f in ${CONF_FILES}
-.if !exists(${CONF_DIR}/${f})
-	@${TOUCH} ${CONF_DIR}/${f}
-.endif
-.endfor
-
-create-data-files:
-.for f in ${DATA_FILES}
-.if !exists(${DATADIR}/${f})
-	@${TOUCH} ${DATADIR}/${f}
-.endif
-.endfor
-
-display-message:
-.if ${SUBSYS} != devel
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/isc-dhcp30-server/distinfo b/net/isc-dhcp30-server/distinfo
deleted file mode 100644
index a806bc46fa23..000000000000
--- a/net/isc-dhcp30-server/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (dhcp-3.0.1rc12.tar.gz) = cf00193dcf349c888a62e4462ae1eb9c
-SIZE (dhcp-3.0.1rc12.tar.gz) = 857323
diff --git a/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample
deleted file mode 100644
index 63bc57ba0f3d..000000000000
--- a/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: dhcpd
-# REQUIRE: DAEMON
-# KEYWORD: FreeBSD
-#
-# Add the following line to /etc/rc.conf to enable dhcpd:
-#
-# dhcpd_enable="YES"
-#
-
-# override these variables in /etc/rc.conf
-dhcpd_enable=NO
-dhcpd_flags=				# command option(s)
-dhcpd_conf=%%PREFIX%%/etc/dhcpd.conf	# configuration file
-dhcpd_ifaces=				# ethernet interface(s)
-
-dhcpd_precmd ()
-{
-	dhcpd_rcconf=%%PREFIX%%/etc/rc.isc-dhcpd.conf
-
-	if [ -f ${dhcpd_rcconf} ]; then
-		warn "${dhcpd_rcconf} is obsolete, use /etc/rc.conf instead."
-		. ${dhcpd_rcconf}
-
-		if [ -n "${dhcpd_options}" -a -z "${rc_flags}" ]; then
-			warn "dhcpd_options is obsolete, use dhcpd_flags instead."
-			rc_flags=${dhcpd_options}
-		fi
-	fi
-
-	rc_flags="${rc_flags} -cf ${dhcpd_conf} ${dhcpd_ifaces}"
-}
-
-. %%RC_SUBR%%
-
-name=dhcpd
-rcvar=$(set_rcvar)
-
-command=%%PREFIX%%/sbin/${name}
-pidfile=/var/run/${name}.pid
-required_files=${dhcpd_conf}
-start_precmd=${name}_precmd
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample
deleted file mode 100644
index 4302d7360ff1..000000000000
--- a/net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: dhcrelay
-# REQUIRE: DAEMON
-# KEYWORD: FreeBSD
-#
-# Add the following line to /etc/rc.conf to enable dhcrelay:
-#
-# dhcrelay_enable="YES"
-#
-
-# override these variables in /etc/rc.conf
-dhcrelay_enable=NO
-dhcrelay_flags=				# command option(s)
-dhcrelay_servers=			# dhcrelay server(s)
-dhcrelay_ifaces=			# ethernet interface(s)
-
-dhcrelay_precmd ()
-{
-	local ifaces
-
-	dhcrelay_rcconf=%%PREFIX%%/etc/rc.isc-dhcrelay.conf
-
-	if [ -f ${dhcrelay_rcconf} ]; then
-		warn "${dhcrelay_rcconf} is obsolete, use /etc/rc.conf instead."
-		. ${dhcrelay_rcconf}
-
-		if [ -n "${dhcrelay_options}" -a -z "${rc_flags}" ]; then
-			warn "dhcrelay_options is obsolete, use dhcrelay_flags instead."
-			rc_flags=${dhcrelay_options}
-		fi
-	fi
-
-	if [ -z "${dhcrelay_servers}" ]; then
-		err 1 "no dhcrelay server(s) configured."
-	fi
-
-	ifaces=
-	for iface in ${dhcrelay_ifaces}; do
-		ifaces="${ifaces} -i ${iface}"
-	done
-
-	rc_flags="${rc_flags} ${ifaces} ${dhcrelay_servers}"
-}
-
-. %%RC_SUBR%%
-
-name=dhcrelay
-rcvar=$(set_rcvar)
-
-command=%%PREFIX%%/sbin/${name}
-pidfile=/var/run/${name}.pid
-start_precmd=${name}_precmd
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/net/isc-dhcp30-server/files/omshell::Makefile.dist b/net/isc-dhcp30-server/files/omshell::Makefile.dist
deleted file mode 100644
index 34c90a2e7f53..000000000000
--- a/net/isc-dhcp30-server/files/omshell::Makefile.dist
+++ /dev/null
@@ -1,80 +0,0 @@
-# Makefile.dist
-#
-# Copyright (c) 1996-2002 Internet Software Consortium.
-# Use is subject to license terms which appear in the file named
-# ISC-LICENSE that should have accompanied this file when you
-# received it.   If a file named ISC-LICENSE did not accompany this
-# file, or you are not sure the one you have is correct, you may
-# obtain an applicable copy of the license at:
-#
-#             http://www.isc.org/isc-license-1.0.html. 
-#
-# This file is part of the ISC DHCP distribution.   The documentation
-# associated with this file is listed in the file DOCUMENTATION,
-# included in the top-level directory of this release.
-#
-# Support and other services are available for ISC products - see
-# http://www.isc.org for more information.
-#
-
-CATMANPAGES = omshell.cat1
-SEDMANPAGES = omshell.man1
-SRCS   = omshell.c
-OBJS   = omshell.o
-PROG   = omshell
-MAN    = omshell.1
-
-INCLUDES = -I$(TOP)/dhcpctl $(BINDINC) -I$(TOP)/includes
-CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
-DHCPCTLLIBS = ../dhcpctl/libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \
-		../omapip/libomapi.a ../dst/libdst.a
-
-all:	$(PROG) $(CATMANPAGES)
-
-$(PROG):	$(OBJS) $(DHCPCTLLIBS)
-	$(CC) $(DEBUG) $(LFLAGS) -o $(PROG) $(OBJS) $(DHCPCTLLIBS) $(LIBS)
-
-install: all $(CATMANPAGES)
-	for dir in $(USRMANDIR) $(USERBINDIR); do \
-	  foo=""; \
-	  for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
-	    foo=$${foo}/$$bar; \
-	    if [ ! -d $$foo ]; then \
-	      mkdir $$foo; \
-	      chmod 755 $$foo; \
-	    fi; \
-	  done; \
-	done
-	$(INSTALL) omshell $(DESTDIR)$(USERBINDIR)
-	$(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell
-	$(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \
-				$(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT)
-
-depend:
-	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS)
-
-clean:
-	-rm -f $(OBJS)
-
-realclean: clean
-	-rm -f $(PROG) *~ $(CATMANPAGES) $(SEDMANPAGES) #*
-
-distclean: realclean
-	-rm -f Makefile
-
-links:
-	@for foo in $(SRCS) $(MAN); do \
-	  if [ ! -b $$foo ]; then \
-	    rm -f $$foo; \
-	  fi; \
-	  ln -s $(TOP)/omshell/$$foo $$foo; \
-	done
-
-omshell.cat1:	omshell.man1
-	nroff -man omshell.man1 >omshell.cat1
-
-omshell.man1:	omshell.1
-	sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
-		-e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1
-
-# Dependencies (semi-automatically-generated)
diff --git a/net/isc-dhcp30-server/files/patch-Makefile b/net/isc-dhcp30-server/files/patch-Makefile
deleted file mode 100644
index 7a8df08b137b..000000000000
--- a/net/isc-dhcp30-server/files/patch-Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
---- Makefile.orig	Fri Nov  8 00:10:07 2002
-+++ Makefile	Mon Apr 28 15:04:50 2003
-@@ -38,59 +38,59 @@
- # ``http://www.nominum.com''.
- #
- 
--all:
-+all all.devel all.server all.relay all.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make all); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--install:
-+install install.devel install.server install.relay install.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make install); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--depend:
-+depend depend.devel depend.server depend.relay depend.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make depend); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--clean:
-+clean clean.devel clean.server clean.relay clean.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make clean); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--realclean:
-+realclean realclean.devel realclean.server realclean.relay realclean.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make realclean); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--distclean:
-+distclean distclean.devel distclean.server distclean.relay distclean.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make distclean); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--links:
-+links links.devel links.server links.relay links.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make links); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
diff --git a/net/isc-dhcp30-server/files/patch-Makefile.dist b/net/isc-dhcp30-server/files/patch-Makefile.dist
deleted file mode 100644
index 9edab8fa4571..000000000000
--- a/net/isc-dhcp30-server/files/patch-Makefile.dist
+++ /dev/null
@@ -1,243 +0,0 @@
---- Makefile.dist.orig	Fri Nov  8 00:10:08 2002
-+++ Makefile.dist	Tue Apr 29 00:07:43 2003
-@@ -3,13 +3,13 @@
- # Copyright (c) 1996-2002 Internet Software Consortium.
- # Use is subject to license terms which appear in the file named
- # ISC-LICENSE that should have accompanied this file when you
--# received it.   If a file named ISC-LICENSE did not accompany this
-+# received it.  If a file named ISC-LICENSE did not accompany this
- # file, or you are not sure the one you have is correct, you may
- # obtain an applicable copy of the license at:
- #
--#             http://www.isc.org/isc-license-1.0.html. 
-+#            http://www.isc.org/isc-license-1.0.html. 
- #
--# This file is part of the ISC DHCP distribution.   The documentation
-+# This file is part of the ISC DHCP distribution.  The documentation
- # associated with this file is listed in the file DOCUMENTATION,
- # included in the top-level directory of this release.
- #
-@@ -17,47 +17,200 @@
- # http://www.isc.org for more information.
- #
- 
--SUBDIRS=	common $(MINIRES) dst omapip server client relay dhcpctl
-+COMMON_SUBDIRS=	common
-+DEVEL_SUBDIRS=	$(MINIRES) dst omapip dhcpctl
-+SERVER_SUBDIRS=	omshell server
-+RELAY_SUBDIRS=	relay
-+CLIENT_SUBDIRS=	client
-+
-+DEVEL_BUILD_SUBDIRS=	${COMMON_SUBDIRS} ${DEVEL_SUBDIRS}
-+SERVER_BUILD_SUBDIRS=	${SERVER_SUBDIRS}
-+RELAY_BUILD_SUBDIRS=	${RELAY_SUBDIRS}
-+CLIENT_BUILD_SUBDIRS=	${CLIENT_SUBDIRS}
-+
-+DEVEL_INSTALL_SUBDIRS=	${COMMON_SUBDIRS} ${DEVEL_SUBDIRS}
-+SERVER_INSTALL_SUBDIRS=	${COMMON_SUBDIRS} ${SERVER_SUBDIRS}
-+RELAY_INSTALL_SUBDIRS=	${RELAY_SUBDIRS}
-+CLIENT_INSTALL_SUBDIRS=	${COMMON_SUBDIRS} ${CLIENT_SUBDIRS}
- 
--all:
--	@for dir in ${SUBDIRS}; do \
-+all: all.server all.relay all.client
-+
-+all.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Making all in $$dir"; \
-+		(cd $$dir; $(MAKE) all) || exit 1; \
-+	done
-+
-+all.server: all.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Making all in $$dir"; \
-+		(cd $$dir; $(MAKE) all) || exit 1; \
-+	done
-+
-+all.relay: all.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Making all in $$dir"; \
-+		(cd $$dir; $(MAKE) all) || exit 1; \
-+	done
-+
-+all.client: all.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
- 		echo "Making all in $$dir"; \
- 		(cd $$dir; $(MAKE) all) || exit 1; \
--	 done
-+	done
-+
-+install: install.devel install.server install.relay install.client
-+
-+install.devel:
-+	@for dir in ${DEVEL_INSTALL_SUBDIRS}; do \
-+		echo "Installing in $$dir"; \
-+		(cd $$dir; $(MAKE) install) || exit 1; \
-+	done
- 
--install:
--	@for dir in ${SUBDIRS}; do \
-+install.server:
-+	@for dir in ${SERVER_INSTALL_SUBDIRS}; do \
- 		echo "Installing in $$dir"; \
- 		(cd $$dir; $(MAKE) install) || exit 1; \
--	 done
-+	done
- 
--depend:
--	@for dir in ${SUBDIRS}; do \
-+install.relay:
-+	@for dir in ${RELAY_INSTALL_SUBDIRS}; do \
-+		echo "Installing in $$dir"; \
-+		(cd $$dir; $(MAKE) install) || exit 1; \
-+	done
-+
-+install.client:
-+	@for dir in ${CLIENT_INSTALL_SUBDIRS}; do \
-+		echo "Installing in $$dir"; \
-+		(cd $$dir; $(MAKE) install) || exit 1; \
-+	done
-+
-+depend: depend.server depend.relay depend.client
-+
-+depend.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Making dependencies in $$dir"; \
-+		(cd $$dir; $(MAKE) depend) || exit 1; \
-+	done
-+
-+depend.server: depend.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Making dependencies in $$dir"; \
-+		(cd $$dir; $(MAKE) depend) || exit 1; \
-+	done
-+
-+depend.relay: depend.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
- 		echo "Making dependencies in $$dir"; \
- 		(cd $$dir; $(MAKE) depend) || exit 1; \
--	 done
-+	done
-+
-+depend.client: depend.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
-+		echo "Making dependencies in $$dir"; \
-+		(cd $$dir; $(MAKE) depend) || exit 1; \
-+	done
-+
-+clean: clean.server clean.relay clean.client
-+
-+clean.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) clean) || exit 1; \
-+	done
-+
-+clean.server: clean.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) clean) || exit 1; \
-+	done
-+
-+clean.relay: clean.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) clean) || exit 1; \
-+	done
- 
--clean:
--	@for dir in ${SUBDIRS}; do \
-+clean.client: clean.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
- 		echo "Cleaning in $$dir"; \
- 		(cd $$dir; $(MAKE) clean) || exit 1; \
--	 done
-+	done
-+
-+realclean: realclean.server realclean.relay realclean.client
-+
-+realclean.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) realclean) || exit 1; \
-+	done
- 
--realclean:
--	@for dir in ${SUBDIRS}; do \
-+realclean.server: realclean.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
- 		echo "Really cleaning in $$dir"; \
- 		(cd $$dir; $(MAKE) realclean) || exit 1; \
--	 done
-+	done
- 
--distclean:
--	@for dir in ${SUBDIRS}; do \
-+realclean.relay: realclean.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) realclean) || exit 1; \
-+	done
-+
-+realclean.client: realclean.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
-+		echo "Really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) realclean) || exit 1; \
-+	done
-+
-+distclean: distclean.server distclean.relay distclean.client
-+
-+distclean.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
- 		echo "Really, really cleaning in $$dir"; \
- 		(cd $$dir; $(MAKE) distclean) || exit 1; \
--	 done
--	@rm -f Makefile
-+	done
-+
-+distclean.server: distclean.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Really, really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) distclean) || exit 1; \
-+	done
-+
-+distclean.relay: distclean.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Really, really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) distclean) || exit 1; \
-+	done
-+
-+distclean.client: distclean.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
-+		echo "Really, really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) distclean) || exit 1; \
-+	done
-+
-+links: links.server links.relay links.client
-+
-+links.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Making links in $$dir"; \
-+		(cd $$dir; $(MAKE) links) || exit 1; \
-+	done
-+
-+links.server: links.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Making links in $$dir"; \
-+		(cd $$dir; $(MAKE) links) || exit 1; \
-+	done
-+
-+links.relay: links.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Making links in $$dir"; \
-+		(cd $$dir; $(MAKE) links) || exit 1; \
-+	done
- 
--links:
--	@for dir in ${SUBDIRS}; do \
-+links.client: links.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
- 		echo "Making links in $$dir"; \
- 		(cd $$dir; $(MAKE) links) || exit 1; \
--	 done
-+	done
diff --git a/net/isc-dhcp30-server/files/patch-client::clparse.c b/net/isc-dhcp30-server/files/patch-client::clparse.c
deleted file mode 100644
index 4140cc6e3109..000000000000
--- a/net/isc-dhcp30-server/files/patch-client::clparse.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/clparse.c.orig	Mon Feb 10 01:39:57 2003
-+++ client/clparse.c	Wed Mar  3 01:35:39 2004
-@@ -785,7 +785,7 @@
- 		if (status != ISC_R_SUCCESS)
- 			log_fatal ("Can't record interface %s: %s",
- 				   name, isc_result_totext (status));
--		strcpy (ip -> name, name);
-+		strlcpy (ip -> name, name, IFNAMSIZ);
- 		if (dummy_interfaces) {
- 			interface_reference (&ip -> next,
- 					     dummy_interfaces, MDL);
diff --git a/net/isc-dhcp30-server/files/patch-client::dhclient.8 b/net/isc-dhcp30-server/files/patch-client::dhclient.8
deleted file mode 100644
index a602907c31b6..000000000000
--- a/net/isc-dhcp30-server/files/patch-client::dhclient.8
+++ /dev/null
@@ -1,83 +0,0 @@
---- client/dhclient.8.orig	Sun Nov 17 03:25:43 2002
-+++ client/dhclient.8	Wed Mar  3 02:06:52 2004
-@@ -18,6 +18,10 @@
- .\"
- .\" $Id: dhclient.8,v 1.12.2.7 2002/11/17 02:25:43 dhankins Exp $
- .\"
-+.\" Portions copyright (c) 2000 David E. O'Brien.
-+.\" All rights reserved.
-+.\" $FreeBSD$
-+.\"
- .TH dhclient 8
- .SH NAME
- dhclient - Dynamic Host Configuration Protocol Client
-@@ -28,12 +32,18 @@
- .I port
- ]
- [
-+.B -D
-+]
-+[
- .B -d
- ]
- [
- .B -q
- ]
- [
-+.B -v
-+]
-+[
- .B -1
- ]
- [
-@@ -64,6 +74,10 @@
- relay
- ]
- [
-+.B -i
-+interval
-+]
-+[
- .B -n
- ]
- [
-@@ -148,6 +162,15 @@
- configuration file or on the command line, and will ignore all other
- interfaces.
- .PP
-+The
-+.B -D
-+flag causes
-+.B dhclient
-+to save the script it creates for use in conjunction with
-+.B dhclient-script
-+in
-+.IR /tmp.
-+.PP
- If the DHCP client should listen and transmit on a port other than the
- standard (port 68), the
- .B -p
-@@ -171,6 +194,12 @@
- flag, followed by the IP address to send.   This is only useful for testing,
- and should not be expected to work in any consistent or useful way.
- .PP
-+On FreeBSD, dhclient can be enabled to automatically handle the
-+link status of the network card. Normally polling is done every
-+five seconds. The polling interval can be set using the
-+.B -i
-+flag, followed by the numbers of seconds. Minimum is one second.
-+.PP
- The DHCP client will normally run in the foreground until it has
- configured an interface, and then will revert to running in the
- background.   To run force dhclient to always run as a foreground
-@@ -188,6 +217,10 @@
- .B -q
- flag prevents any messages other than errors from being printed to the
- standard error descriptor.
-+.B -v
-+flag turns on all messages.
-+Opposite of
-+.B -q .
- .PP
- The client normally doesn't release the current lease as it is not
- required by the DHCP protocol.  Some cable ISPs require their clients
diff --git a/net/isc-dhcp30-server/files/patch-client::dhclient.c b/net/isc-dhcp30-server/files/patch-client::dhclient.c
deleted file mode 100644
index 27cef99162df..000000000000
--- a/net/isc-dhcp30-server/files/patch-client::dhclient.c
+++ /dev/null
@@ -1,545 +0,0 @@
---- client/dhclient.c.orig	Sat Apr 26 23:51:39 2003
-+++ client/dhclient.c	Wed Mar  3 16:21:02 2004
-@@ -47,6 +47,13 @@
- #include "dhcpd.h"
- #include "version.h"
- 
-+#if __FreeBSD_version > 502010
-+#include <sys/ioctl.h>
-+#include <net/if_media.h>
-+#include <net80211/ieee80211_ioctl.h>
-+#include <net80211/ieee80211.h>
-+#endif
-+
- TIME cur_time;
- TIME default_lease_time = 43200; /* 12 hours... */
- TIME max_lease_time = 86400; /* 24 hours... */
-@@ -82,8 +89,11 @@
- struct string_list *client_env=NULL;
- int client_env_count=0;
- int onetry=0;
--int quiet=0;
-+int quiet=1;
- int nowait=0;
-+#ifdef ENABLE_POLLING_MODE
-+int polling_interval = 5;
-+#endif
- 
- static void usage PROTO ((void));
- 
-@@ -184,6 +194,9 @@
- 		} else if (!strcmp (argv [i], "-q")) {
- 			quiet = 1;
- 			quiet_interface_discovery = 1;
-+		} else if (!strcmp (argv [i], "-v")) {
-+			quiet = 0;
-+			quiet_interface_discovery = 0;
- 		} else if (!strcmp (argv [i], "-s")) {
- 			if (++i == argc)
- 				usage ();
-@@ -197,6 +210,19 @@
- 		} else if (!strcmp (argv [i], "-n")) {
- 			/* do not start up any interfaces */
- 			interfaces_requested = 1;
-+#ifdef ENABLE_POLLING_MODE
-+		} else if (!strcmp (argv [i], "-i")) {
-+			if (++i == argc)
-+				usage ();
-+			polling_interval = (int)strtol (argv [i],
-+			    (char **)NULL, 10);
-+			if (polling_interval <= 0) {
-+				log_info ("Incorrect polling interval %d",
-+				    polling_interval);
-+				log_info ("Using a default of 5 seconds");
-+				polling_interval = 5;
-+			}
-+#endif
- 		} else if (!strcmp (argv [i], "-w")) {
- 			/* do not exit if there are no broadcast interfaces. */
- 			persist = 1;
-@@ -225,7 +251,16 @@
- 		    if (strlen (argv [i]) > sizeof tmp -> name)
- 			    log_fatal ("%s: interface name too long (max %ld)",
- 				       argv [i], (long)strlen (argv [i]));
-- 		    strcpy (tmp -> name, argv [i]);
-+ 		    strlcpy (tmp -> name, argv [i], IFNAMSIZ);
-+#if __FreeBSD_version > 502010
-+		    set_ieee80211 (tmp);
-+#endif
-+		    /* Init some interface vars, enable polling */
-+#ifdef ENABLE_POLLING_MODE
-+		    tmp -> forcediscover = 0;
-+		    tmp -> linkstate = HAVELINK;
-+		    tmp -> polling = 1;
-+#endif /* ifdef ENABLE_POLLING_MODE */
- 		    if (interfaces) {
- 			    interface_reference (&tmp -> next,
- 						 interfaces, MDL);
-@@ -385,6 +420,16 @@
- 					     INTERFACE_AUTOMATIC)) !=
- 			     INTERFACE_REQUESTED))
- 				continue;
-+#if __FreeBSD_version > 502010
-+			set_ieee80211 (ip);
-+#endif
-+#ifdef ENABLE_POLLING_MODE
-+			ip -> forcediscover = 0;
-+			if (ip -> client -> config -> media != NULL)
-+				ip -> havemedia = 1;
-+			else
-+				ip -> havemedia = 0;
-+#endif
- 			script_init (ip -> client,
- 				     "PREINIT", (struct string_list *)0);
- 			if (ip -> client -> alias)
-@@ -427,8 +472,13 @@
- 				client -> state = S_INIT;
- 				/* Set up a timeout to start the initialization
- 				   process. */
-+#ifdef ENABLE_POLLING_MODE
-+				add_timeout (cur_time + random () % 5 + 2,
-+					     state_polling, client, 0, 0);
-+#else
- 				add_timeout (cur_time + random () % 5,
- 					     state_reboot, client, 0, 0);
-+#endif
- 			}
- 		}
- 	}
-@@ -486,9 +536,9 @@
- 	log_info (arr);
- 	log_info (url);
- 
--	log_error ("Usage: dhclient [-1dqr] [-nw] [-p <port>] %s",
--		   "[-s server]");
--	log_error ("                [-cf config-file] [-lf lease-file]%s",
-+	log_error ("Usage: dhclient [-1Ddqrv] [-i polling-interval] %s",
-+		   "[-nw] [-p <port>] [-s server]");
-+	log_error ("                [-cf config-file] [-lf lease-file] %s",
- 		   "[-pf pid-file] [-e VAR=val]");
- 	log_fatal ("                [-sf script-file] [interface]");
- }
-@@ -876,6 +926,15 @@
- 	/* Write out the new lease. */
- 	write_client_lease (client, client -> new, 0, 0);
- 
-+	/*
-+	 * It's now possible that state_reboot can be called
-+	 * after a interface link went down and is up again.
-+	 * To prevent tons of equal leases saved on disk, we rewrite
-+	 * them.
-+	 */
-+	read_client_leases ();
-+	rewrite_client_leases ();
-+ 
- 	/* Replace the old active lease with the new one. */
- 	if (client -> active)
- 		destroy_client_lease (client -> active);
-@@ -890,6 +949,12 @@
- 	      piaddr (client -> active -> address),
- 	      (long)(client -> active -> renewal - cur_time));
- 	client -> state = S_BOUND;
-+#ifdef ENABLE_POLLING_MODE
-+	/* Init some interface vars, enable polling */
-+	client -> interface -> linkstate = HAVELINK;
-+	client -> interface -> forcediscover = 0;
-+	client -> interface -> polling = 1;
-+#endif /* ifdef ENABLE_POLLING_MODE */
- 	reinitialize_interfaces ();
- 	go_daemon ();
- 	if (client -> config -> do_forward_update) {
-@@ -1352,6 +1417,11 @@
- 	int interval;
- 	int increase = 1;
- 
-+#ifdef ENABLE_POLLING_MODE
-+	/* Disable polling for this interface */
-+	client -> interface -> polling = 0;
-+#endif
-+
- 	/* Figure out how long it's been since we started transmitting. */
- 	interval = cur_time - client -> first_sending;
- 
-@@ -1457,6 +1527,9 @@
- 	struct client_lease *loop;
- 	struct client_lease *lp;
- 
-+	if (client -> interface -> linkstate == NOLINK)
-+		return;
-+
- 	loop = lp = client -> active;
- 
- 	log_info ("No DHCPOFFERS received.");
-@@ -1489,6 +1562,10 @@
- 				log_info ("bound: renewal in %ld %s.",
- 					  (long)(client -> active -> renewal -
- 						 cur_time), "seconds");
-+#ifdef ENABLE_POLLING_MODE
-+				/* Enable polling for this interface */
-+				client -> interface -> polling = 1;
-+#endif
- 				add_timeout (client -> active -> renewal,
- 					     state_bound, client, 0, 0);
- 			    } else {
-@@ -1496,6 +1573,11 @@
- 				log_info ("bound: immediate renewal.");
- 				state_bound (client);
- 			    }
-+			    /*
-+			     * Set the link status back to nolink, even
-+			     * if we have media settings.
-+			     */
-+                            client -> interface -> linkstate = NOLINK;
- 			    reinitialize_interfaces ();
- 			    go_daemon ();
- 			    return;
-@@ -1541,6 +1623,12 @@
- 	}
- 
- 	log_info ("No working leases in persistent database - sleeping.");
-+
-+#ifdef ENABLE_POLLING_MODE
-+	/* Enable polling for this interface */
-+	client -> interface -> polling = 1;
-+#endif
-+
- 	script_init (client, "FAIL", (struct string_list *)0);
- 	if (client -> alias)
- 		script_write_params (client, "alias_", client -> alias);
-@@ -1681,6 +1769,18 @@
- 			client -> packet.secs = htons (65535);
- 	}
- 
-+	/*
-+	 * Only try the first ten seconds to renew a lease from a
-+	 * given dhcp-server adress. After that, fall back to use
-+	 * state_reboot with INADDR_BROADCAST.
-+	 */
-+	if (destination.sin_addr.s_addr != INADDR_BROADCAST &&
-+	   (client -> state == S_RENEWING || client -> state == S_REBINDING)) {
-+		if (client -> active && client -> active -> expiry > cur_time &&
-+			interval >= 10)
-+			goto cancel;
-+	}
-+
- 	log_info ("DHCPREQUEST on %s to %s port %d",
- 	      client -> name ? client -> name : client -> interface -> name,
- 	      inet_ntoa (destination.sin_addr),
-@@ -1702,6 +1802,16 @@
- 				      from, &destination,
- 				      (struct hardware *)0);
- 
-+	/*
-+	 * If sendto() for a direct request fails, fall back to use
-+	 * state_reboot with INADDR_BROADCAST.
-+	 */
-+	if (result == -1 && destination.sin_addr.s_addr != INADDR_BROADCAST &&
-+	   (client -> state == S_RENEWING || client -> state == S_REBINDING)) {
-+		if (client -> active && client -> active -> expiry > cur_time)
-+			goto cancel;
-+	}
-+
- 	add_timeout (cur_time + client -> interval,
- 		     send_request, client, 0, 0);
- }
-@@ -2597,6 +2707,13 @@
- 			wstatus = 0;
- 		}
- 	} else {
-+		if ((i = open(_PATH_DEVNULL, O_RDWR)) != -1) {
-+			dup2(i, STDIN_FILENO);
-+			dup2(i, STDOUT_FILENO);
-+			dup2(i, STDERR_FILENO);
-+			if (i > STDERR_FILENO)
-+				close(i);
-+		}
- 		execve (scriptName, argv, envp);
- 		log_error ("execve (%s, ...): %m", scriptName);
- 		exit (0);
-@@ -2783,8 +2900,10 @@
- 			      case S_STOPPED:
- 				break;
- 			}
-+#ifndef ENABLE_POLLING_MODE
- 			client -> state = S_INIT;
- 			state_reboot (client);
-+#endif
- 		}
- 	}
- }
-@@ -3010,7 +3129,9 @@
- 		    break;
- 
- 		  case server_awaken:
-+#ifndef ENABLE_POLLING_MODE
- 		    state_reboot (client);
-+#endif
- 		    break;
- 		}
- 	    }
-@@ -3147,3 +3268,265 @@
- 	data_string_forget (&ddns_dhcid, MDL);
- 	return rcode;
- }
-+ 
-+/* Check to see if there's a wire plugged in */
-+int
-+interface_active(struct interface_info *ip) {
-+#if __FreeBSD_version > 502010
-+	struct ifmediareq ifmr;
-+	int *media_list, i;
-+	char *ifname;
-+	int sock;
-+ 
-+	ifname = ip -> name;
-+ 
-+	if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
-+		log_fatal ("Can't create interface_active socket");
-+ 
-+	(void) memset (&ifmr, 0, sizeof (ifmr));
-+	(void) strncpy (ifmr.ifm_name, ifname, sizeof (ifmr.ifm_name));
-+ 
-+	if (ioctl (sock, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
-+		/*
-+		 * Interface doesn't support SIOCGIFMEDIA, presume okay
-+		 */
-+		close (sock);
-+		return (HAVELINK);
-+	}
-+	close (sock);
-+ 
-+	if (ifmr.ifm_count == 0) {
-+		/*
-+		 * Assume that this means interface
-+		 * does not support SIOCGIFMEDIA
-+		 */
-+		log_fatal ("%s: no media types?", ifname);
-+		return (HAVELINK);
-+	}
-+ 
-+	if (ifmr.ifm_status & IFM_AVALID) {
-+		if (ip -> ieee80211) {
-+			/*
-+			 * Wavelan devices need to be checked if they are
-+			 * associated.
-+			 */
-+			if ((IFM_TYPE(ifmr.ifm_active) == IFM_IEEE80211) &&
-+			     (ifmr.ifm_status & IFM_ACTIVE)) {
-+				return (HAVELINK);
-+			}
-+		} else {
-+			if (ifmr.ifm_status & IFM_ACTIVE) {
-+				return (HAVELINK);
-+			}
-+		}
-+		/*
-+		 * We really have no link.
-+		 */
-+		return (NOLINK);
-+	}
-+	/*
-+	 * IFM_AVALID is not set. We cannot check
-+	 * the link state. Assume HAVELINK.
-+	 */
-+ 
-+#endif /* Other OSs */
-+	/*
-+	 * Always return a successful link if the OS
-+	 * is not supported.
-+	 */
-+	return (HAVELINK);
-+}
-+ 
-+#if __FreeBSD_version > 502010
-+void
-+set_ieee80211 (struct interface_info *ip) {
-+ 
-+	struct ieee80211req     ireq;
-+	u_int8_t                data[32];
-+	int                     associated = 0;
-+	int *media_list, i;
-+	char *ifname;
-+	int sock;
-+ 
-+	ifname = ip -> name;
-+ 
-+	if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
-+		log_fatal ("Can't create interface_active socket");
-+ 
-+	(void) memset (&ireq, 0, sizeof (ireq));
-+	(void) strncpy (ireq.i_name, ifname, sizeof (ireq.i_name));
-+	ireq.i_data = &data;
-+	ireq.i_type = IEEE80211_IOC_SSID;
-+	ireq.i_val = -1;
-+	/*
-+	 * If we can't get the SSID,
-+	 * this isn't an 802.11 device.
-+	 */
-+	if (ioctl (sock, SIOCG80211, &ireq) < 0)
-+		ip -> ieee80211 = 0;
-+	else {
-+#ifdef DEBUG
-+		printf ("Device %s has 802.11\n", ifname);
-+#endif
-+		ip -> ieee80211 = 1;
-+	}
-+	close (sock);
-+ }
-+#endif /* __FreeBSD_version */
-+ 
-+#ifdef ENABLE_POLLING_MODE
-+/* Go to background after some time */
-+void state_background (cpp)
-+	void *cpp;
-+{
-+	go_daemon ();
-+}
-+
-+/* Check the state of the NICs if we have link */
-+void state_polling (cpp)
-+	 void *cpp;
-+{
-+	static int doinitcheck = 0;
-+	struct interface_info *ip;
-+	struct client_state *client;
-+	int result;
-+ 
-+	for (ip = interfaces; ip; ip = ip -> next) {
-+		if (! ip -> polling)
-+			continue;
-+#ifdef DEBUG
-+		printf ("%s: Polling interface state\n", ip -> name);
-+		for (client = ip -> client;
-+		     client; client = client -> next) {
-+			printf ("%s: client state of %d\n", ip -> name, ip -> client -> state);
-+			printf ("%s: link = %d\n", ip -> name, ip -> linkstate);
-+		}
-+#endif
-+ 
-+		result = interface_active (ip);
-+		/*
-+		 * If dhclient.conf contains media settings, we cannot
-+		 * abort if the interface is not set to active mode.
-+		 */
-+		if (ip -> havemedia && ip -> client -> state != S_BOUND) {
-+			if (result == HAVELINK)
-+				ip -> forcediscover = 1;
-+			result = HAVELINK;
-+		}
-+ 
-+		/*
-+		 * The last status of the interface tells us
-+		 * the we've got no link ...
-+		 */
-+		if (ip -> linkstate == NOLINK || ! doinitcheck) {
-+			/*
-+			 * ... but we have now link. Let's send
-+			 * requests.
-+			 */
-+			if (result == HAVELINK) {
-+#ifdef DEBUG
-+				if (ip -> havemedia)
-+					printf ("%s: Trying media settings on interface\n",
-+						ip -> name);
-+				else
-+					printf ("%s: Found Link on interface\n", ip -> name);
-+#endif
-+				/*
-+				 * Set the interface to state_bound. We assume that we have
-+				 * a working link. If we cannot reach the server directly,
-+				 * INADDR_BROADCAST is used.
-+				 */
-+				for (client = ip -> client;
-+				     client; client = client -> next) {
-+					cancel_timeout (state_init, client);
-+					cancel_timeout (state_reboot, client);
-+					cancel_timeout (state_selecting, client);
-+					if (client -> active) {
-+						add_timeout (cur_time + random () % 5,
-+						   state_bound, client, 0, 0);
-+					} else {
-+						add_timeout (cur_time + random () % 5,
-+						   state_reboot, client, 0, 0);
-+					}
-+				}
-+				ip -> linkstate = HAVELINK;
-+			} else {
-+#ifdef DEBUG
-+				printf ("%s: No link on interface\n", ip -> name);
-+#endif
-+				for (client = ip -> client;
-+				     client; client = client -> next) {
-+					/*
-+					 * Without this add_timout(), dhclient does
-+					 * not poll on a interface if there
-+					 * is no cable plugged in at startup
-+					 * time. Because we add one additional second
-+					 * to the time of a normal timeout, we always
-+					 * skip and block a running one. This prevents
-+					 * that polling is done twice at the same time.
-+					 */
-+					if (client -> state == S_INIT) {
-+						add_timeout (cur_time + (polling_interval + 1),
-+							     state_polling, client, 0, 0);
-+					}
-+				}
-+				ip -> linkstate = NOLINK;
-+				/*
-+				 * Automatically go into the background after
-+				 * some time. Do this only if there are no
-+				 * media options available for a interface.
-+				 */
-+				if (! ip -> havemedia && ! doinitcheck) {
-+					add_timeout (cur_time + (polling_interval * 2),
-+						    state_background, client, 0, 0);
-+				}
-+			}
-+		}
-+ 
-+		/*
-+		 * The last status of the interface tells us
-+		 * the we previously had link.
-+		 */
-+		if (ip -> linkstate == HAVELINK && doinitcheck) {
-+			if (result == NOLINK) {
-+				/*
-+				 * We lost link on the interface, or it isn't
-+				 * associated anymore.
-+				 */
-+#ifdef DEBUG
-+				printf ("%s: Lost Link on interface\n", ip -> name);
-+#endif
-+				/*
-+				 * After we lost link, cycle again through the
-+				 * different media settings if available. Else
-+				 * set NOLINK.
-+				 */
-+				if (ip -> havemedia)
-+					ip -> forcediscover = 1;
-+				else
-+					ip -> linkstate = NOLINK;
-+			}
-+			/*
-+			 * If we happen to have a real link, but no
-+			 * active lease, force the interface into
-+			 * state_reboot. Do the same if media settings
-+			 * are available.
-+			 */
-+			if (ip -> forcediscover) {
-+				for (client = ip -> client;
-+				     client; client = client -> next) {
-+					if (client -> state != S_REBOOTING &&
-+					    client -> state != S_SELECTING) {
-+						add_timeout (cur_time + random () % 5,
-+							    state_reboot, client, 0, 0);
-+					}
-+				}
-+				ip -> forcediscover = 0;
-+				ip -> linkstate = HAVELINK;
-+			}
-+			/* We still have link, do nothing. */
-+		}
-+	}
-+	doinitcheck = 1;
-+}
-+#endif /* ifdef ENABLE_POLLING_MODE */
diff --git a/net/isc-dhcp30-server/files/patch-client::dhclient.conf b/net/isc-dhcp30-server/files/patch-client::dhclient.conf
deleted file mode 100644
index 2d9560f43bf8..000000000000
--- a/net/isc-dhcp30-server/files/patch-client::dhclient.conf
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/dhclient.conf.orig	Tue Jun  3 00:50:44 1997
-+++ client/dhclient.conf	Wed Mar  3 02:20:41 2004
-@@ -11,7 +11,7 @@
- reboot 10;
- select-timeout 5;
- initial-interval 2;
--script "/etc/dhclient-script";
-+script "%%PREFIX%%/sbin/dhclient-script";
- media "-link0 -link1 -link2", "link0 link1";
- reject 192.33.137.209;
- 
diff --git a/net/isc-dhcp30-server/files/patch-common::dhcp-options.5 b/net/isc-dhcp30-server/files/patch-common::dhcp-options.5
deleted file mode 100644
index 9d936cfffeee..000000000000
--- a/net/isc-dhcp30-server/files/patch-common::dhcp-options.5
+++ /dev/null
@@ -1,32 +0,0 @@
---- common/dhcp-options.5.orig	Sun Feb 23 04:27:42 2003
-+++ common/dhcp-options.5	Wed Mar  3 02:12:13 2004
-@@ -431,7 +431,10 @@
- the domain-name option to specify the domain name).  See RFC 1035 for
- character set restrictions.  This option is only honored by
- .B dhclient-script(8)
--if the hostname for the client machine is not set.
-+if the hostname for the client machine is not set (i.e., set to the empty
-+string in
-+.B rc.conf(5)
-+).
- .RE
- .PP
- .B option \fBieee802-3-encapsulation\fR \fIflag\fR\fB;\fR
-@@ -654,7 +657,7 @@
- This option specifies whether the client should configure its IP
- layer to allow forwarding of datagrams with non-local source routes
- (see Section 3.3.5 of [4] for a discussion of this topic).  A value
--of false means disallow forwarding of such datagrams, and a value of true
-+of 0 means disallow forwarding of such datagrams, and a value of true
- means allow forwarding.
- .RE
- .PP
-@@ -948,7 +951,7 @@
- .PP
- This option specifies whether or not the client should negotiate the
- use of trailers (RFC 893 [14]) when using the ARP protocol.  A value
--of false indicates that the client should not attempt to use trailers.  A
-+of 0 indicates that the client should not attempt to use trailers.  A
- value of true means that the client should attempt to use trailers.
- .RE
- .PP
diff --git a/net/isc-dhcp30-server/files/patch-common::discover.c b/net/isc-dhcp30-server/files/patch-common::discover.c
deleted file mode 100644
index 1cfcc2094098..000000000000
--- a/net/isc-dhcp30-server/files/patch-common::discover.c
+++ /dev/null
@@ -1,238 +0,0 @@
---- common/discover.c.orig	Fri Jul 25 21:44:15 2003
-+++ common/discover.c	Fri Mar  5 23:33:04 2004
-@@ -47,6 +47,7 @@
- #endif /* not lint */
- 
- #include "dhcpd.h"
-+#include <ifaddrs.h>
- #include <sys/ioctl.h>
- 
- struct interface_info *interfaces, *dummy_interfaces, *fallback_interface;
-@@ -135,10 +136,7 @@
- {
- 	struct interface_info *tmp, *ip;
- 	struct interface_info *last, *next;
--	char buf [2048];
--	struct ifconf ic;
--	struct ifreq ifr;
--	int i;
-+	struct ifaddrs *ifap, *ifa;
- 	int sock;
- 	int address_count = 0;
- 	struct subnet *subnet;
-@@ -157,61 +155,6 @@
- 	if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
- 		log_fatal ("Can't create addrlist socket");
- 
--	/* Get the interface configuration information... */
--
--#ifdef SIOCGIFCONF_ZERO_PROBE
--	/* linux will only tell us how long a buffer it wants if we give it
--	 * a null buffer first. So, do a dry run to figure out the length.
--	 * 
--	 * XXX this code is duplicated from below because trying to fold
--	 * the logic into the if statement and goto resulted in excesssive
--	 * obfuscation. The intent is that unless you run Linux you shouldn't
--	 * have to deal with this. */
--
--	ic.ifc_len = 0;
--	ic.ifc_ifcu.ifcu_buf = (caddr_t)NULL;
--#else
--	/* otherwise, we just feed it a starting size, and it'll tell us if
--	 * it needs more */
--
--	ic.ifc_len = sizeof buf;
--	ic.ifc_ifcu.ifcu_buf = (caddr_t)buf;
--#endif
--
--      gifconf_again:
--	i = ioctl(sock, SIOCGIFCONF, &ic);
--
--	if (i < 0)
--		log_fatal ("ioctl: SIOCGIFCONF: %m");
--
--#ifdef SIOCGIFCONF_ZERO_PROBE
--	/* Workaround for SIOCGIFCONF bug on some Linux versions. */
--	if (ic.ifc_ifcu.ifcu_buf == 0 && ic.ifc_len == 0) {
--		ic.ifc_len = sizeof buf;
--		ic.ifc_ifcu.ifcu_buf = (caddr_t)buf;
--		goto gifconf_again;
--	}
--#endif
--
--	/* If the SIOCGIFCONF resulted in more data than would fit in
--	   a buffer, allocate a bigger buffer. */
--	if ((ic.ifc_ifcu.ifcu_buf == buf 
--#ifdef SIOCGIFCONF_ZERO_PROBE
--	     || ic.ifc_ifcu.ifcu_buf == 0
--#endif
--		) && ic.ifc_len > sizeof buf) {
--		ic.ifc_ifcu.ifcu_buf = dmalloc ((size_t)ic.ifc_len, MDL);
--		if (!ic.ifc_ifcu.ifcu_buf)
--			log_fatal ("Can't allocate SIOCGIFCONF buffer.");
--		goto gifconf_again;
--#ifdef SIOCGIFCONF_ZERO_PROBE
--	} else if (ic.ifc_ifcu.ifcu_buf == 0) {
--		ic.ifc_ifcu.ifcu_buf = (caddr_t)buf;
--		ic.ifc_len = sizeof buf;
--		goto gifconf_again;
--#endif
--	}
--
- 		
- 	/* If we already have a list of interfaces, and we're running as
- 	   a DHCP server, the interfaces were requested. */
-@@ -224,51 +167,38 @@
- 	else
- 		ir = INTERFACE_REQUESTED;
- 
-+	if (getifaddrs(&ifap) != 0)
-+		log_fatal ("getifaddrs failed");
-+
- 	/* Cycle through the list of interfaces looking for IP addresses. */
--	for (i = 0; i < ic.ifc_len;) {
--		struct ifreq *ifp = (struct ifreq *)((caddr_t)ic.ifc_req + i);
--#ifdef HAVE_SA_LEN
--		if (ifp -> ifr_addr.sa_len > sizeof (struct sockaddr))
--			i += (sizeof ifp -> ifr_name) + ifp -> ifr_addr.sa_len;
--		else
--#endif
--			i += sizeof *ifp;
-+	for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
- 
- #ifdef ALIAS_NAMES_PERMUTED
--		if ((s = strrchr (ifp -> ifr_name, ':'))) {
-+		if ((s = strrchr (ifa -> ifa_name, ':'))) {
- 			*s = 0;
- 		}
- #endif
- 
- #ifdef SKIP_DUMMY_INTERFACES
--		if (!strncmp (ifp -> ifr_name, "dummy", 5))
-+		if (!strncmp (ifa -> ifa_name, "dummy", 5))
- 			continue;
- #endif
- 
--
--		/* See if this is the sort of interface we want to
--		   deal with. */
--		strcpy (ifr.ifr_name, ifp -> ifr_name);
--		if (ioctl (sock, SIOCGIFFLAGS, &ifr) < 0)
--			log_fatal ("Can't get interface flags for %s: %m",
--			       ifr.ifr_name);
--
- 		/* See if we've seen an interface that matches this one. */
- 		for (tmp = interfaces; tmp; tmp = tmp -> next)
--			if (!strcmp (tmp -> name, ifp -> ifr_name))
-+			if (!strcmp (tmp -> name, ifa -> ifa_name))
- 				break;
- 
--		/* Skip non broadcast interfaces (plus loopback and
--		   point-to-point in case an OS incorrectly marks them
--		   as broadcast). Also skip down interfaces unless we're
-+		/* See if this is the sort of interface we want to
-+		   deal with.  Skip loopback, point-to-point and down
-+		   interfaces, except don't skip down interfaces if we're
- 		   trying to get a list of configurable interfaces. */
--		if (((!(ifr.ifr_flags & IFF_BROADCAST) ||
--		      ifr.ifr_flags & IFF_LOOPBACK ||
--		      ifr.ifr_flags & IFF_POINTOPOINT) && !tmp) ||
--		    (!(ifr.ifr_flags & IFF_UP) &&
-+		if ((ifa->ifa_flags & IFF_LOOPBACK) ||
-+		     (ifa->ifa_flags & IFF_POINTOPOINT) ||
-+		     (!(ifa->ifa_flags & IFF_UP) &&
- 		     state != DISCOVER_UNCONFIGURED))
- 			continue;
--		
-+
- 		/* If there isn't already an interface by this name,
- 		   allocate one. */
- 		if (!tmp) {
-@@ -276,9 +206,9 @@
- 			status = interface_allocate (&tmp, MDL);
- 			if (status != ISC_R_SUCCESS)
- 				log_fatal ("Error allocating interface %s: %s",
--					   ifp -> ifr_name,
-+					   ifa -> ifa_name,
- 					   isc_result_totext (status));
--			strcpy (tmp -> name, ifp -> ifr_name);
-+			strcpy (tmp -> name, ifa -> ifa_name);
- 			interface_snorf (tmp, ir);
- 			interface_dereference (&tmp, MDL);
- 			tmp = interfaces; /* XXX */
-@@ -290,9 +220,9 @@
- 		/* If we have the capability, extract link information
- 		   and record it in a linked list. */
- #ifdef HAVE_AF_LINK
--		if (ifp -> ifr_addr.sa_family == AF_LINK) {
-+		if (ifa -> ifa_addr->sa_family == AF_LINK) {
- 			struct sockaddr_dl *foo = ((struct sockaddr_dl *)
--						   (&ifp -> ifr_addr));
-+						   (ifa -> ifa_addr));
- #if defined (HAVE_SIN_LEN)
- 			tmp -> hw_address.hlen = foo -> sdl_alen;
- #else
-@@ -305,12 +235,11 @@
- 		} else
- #endif /* AF_LINK */
- 
--		if (ifp -> ifr_addr.sa_family == AF_INET) {
-+		if (ifa -> ifa_addr->sa_family == AF_INET) {
- 			struct iaddr addr;
- 
- 			/* Get a pointer to the address... */
--			memcpy (&foo, &ifp -> ifr_addr,
--				sizeof ifp -> ifr_addr);
-+			bcopy(ifa->ifa_addr, &foo, sizeof(foo));
- 
- 			/* We don't want the loopback interface. */
- 			if (foo.sin_addr.s_addr == htonl (INADDR_LOOPBACK) &&
-@@ -323,16 +252,15 @@
- 			   found, keep a pointer to ifreq structure in
- 			   which we found it. */
- 			if (!tmp -> ifp) {
--#ifdef HAVE_SA_LEN
--				unsigned len = ((sizeof ifp -> ifr_name) +
--						ifp -> ifr_addr.sa_len);
--#else
--				unsigned len = sizeof *ifp;
--#endif
-+
-+				int len = (IFNAMSIZ +
-+					ifa -> ifa_addr->sa_len);
- 				tif = (struct ifreq *)dmalloc (len, MDL);
- 				if (!tif)
- 					log_fatal ("no space for ifp.");
--				memcpy (tif, ifp, len);
-+				strlcpy(tif->ifr_name, ifa->ifa_name, IFNAMSIZ);
-+				memcpy(&tif->ifr_addr, ifa->ifa_addr,
-+					ifa->ifa_addr->sa_len);
- 				tmp -> ifp = tif;
- 				tmp -> primary_address = foo.sin_addr;
- 			}
-@@ -346,9 +274,6 @@
- 		}
- 	}
- 
--	/* If we allocated a buffer, free it. */
--	if (ic.ifc_ifcu.ifcu_buf != buf)
--		dfree (ic.ifc_ifcu.ifcu_buf, MDL);
- 
- #if defined (LINUX_SLASHPROC_DISCOVERY)
- 	/* On Linux, interfaces that don't have IP addresses don't
-@@ -529,6 +454,7 @@
- 	   be able to configure, we can quit now. */
- 	if (state == DISCOVER_UNCONFIGURED) {
- 		close (sock);
-+		freeifaddrs(ifap);
- 		return;
- 	}
- 
-@@ -674,6 +600,7 @@
- 	}
- 
- 	close (sock);
-+	freeifaddrs(ifap);
- 
- 	if (state == DISCOVER_SERVER && wifcount == 0) {
- 		log_info ("%s", "");
diff --git a/net/isc-dhcp30-server/files/patch-common::dispatch.c b/net/isc-dhcp30-server/files/patch-common::dispatch.c
deleted file mode 100644
index 0aa709cf0860..000000000000
--- a/net/isc-dhcp30-server/files/patch-common::dispatch.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- common/dispatch.c.orig	Sun Nov 17 03:26:57 2002
-+++ common/dispatch.c	Wed Mar  3 16:20:15 2004
-@@ -95,11 +95,26 @@
- void dispatch ()
- {
- 	struct timeval tv, *tvp;
-+#ifdef ENABLE_POLLING_MODE
-+	struct timeval *tvp_new;
-+#endif
- 	isc_result_t status;
-+	TIME cur_time;
- 
-+	tvp = NULL;
-+#ifdef ENABLE_POLLING_MODE
-+	tvp_new = NULL;
-+#endif
- 	/* Wait for a packet or a timeout... XXX */
- 	do {
- 		tvp = process_outstanding_timeouts (&tv);
-+#ifdef ENABLE_POLLING_MODE
-+		GET_TIME (&cur_time);
-+		add_timeout(cur_time + polling_interval, state_polling, 0, 0, 0);
-+		tvp_new = process_outstanding_timeouts(&tv);
-+		if (tvp != NULL && (tvp -> tv_sec > tvp_new -> tv_sec))
-+			tvp = tvp_new;
-+#endif /* ENABLE_POLLING_MODE */
- 		status = omapi_one_dispatch (0, tvp);
- 	} while (status == ISC_R_TIMEDOUT || status == ISC_R_SUCCESS);
- 	log_fatal ("omapi_one_dispatch failed: %s -- exiting.",
diff --git a/net/isc-dhcp30-server/files/patch-common::parse.c b/net/isc-dhcp30-server/files/patch-common::parse.c
deleted file mode 100644
index 637d69e7f41b..000000000000
--- a/net/isc-dhcp30-server/files/patch-common::parse.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- common/parse.c.orig	2 Sep 2003 11:01:23 -0000
-+++ common/parse.c	22 Feb 2004 10:44:52 -0000
-@@ -414,6 +414,7 @@
- {
- 	const char *val;
- 	enum dhcp_token token;
-+	int32_t num;
- 
- 	token = next_token (&val, (unsigned *)0, cfile);
- 	if (token != NUMBER) {
-@@ -421,9 +422,9 @@
- 		skip_to_semi (cfile);
- 		return;
- 	}
--	convert_num (cfile, (unsigned char *)timep, val, 10, 32);
-+	convert_num (cfile, (unsigned char *)&num, val, 10, 32);
- 	/* Unswap the number - convert_num returns stuff in NBO. */
--	*timep = ntohl (*timep); /* XXX */
-+	*timep = ntohl (num);
- 
- 	parse_semi (cfile);
- }
diff --git a/net/isc-dhcp30-server/files/patch-configure b/net/isc-dhcp30-server/files/patch-configure
deleted file mode 100644
index 5aff6909acce..000000000000
--- a/net/isc-dhcp30-server/files/patch-configure
+++ /dev/null
@@ -1,41 +0,0 @@
---- configure.orig	Sat Apr 20 23:44:13 2002
-+++ configure	Mon Apr 28 23:02:10 2003
-@@ -13,6 +13,9 @@
-   elif [ x$1 = x--dirs ]; then
-     dirs=$2
-     shift
-+  elif [ x$1 = x--subsys ]; then
-+    subsys=$2
-+    shift
-   elif [ x$1 = x--no-links ]; then
-     nolinks=YES
-   elif [ x$1 = x--copts ]; then
-@@ -233,7 +236,14 @@
- fi
- 
- if [ x"$dirs" = x ]; then
--  dirs=". client server relay common omapip dhcpctl minires dst"
-+  dirs=". common minires dst omapip dhcpctl"
-+  if [ x$subsys = x ]; then
-+    dirs="$dirs server omshell client relay"
-+  elif [ x$subsys = xserver ]; then
-+    dirs="$dirs server omshell"
-+  elif [ x$subsys = xclient -o x$subsys = xrelay ]; then
-+    dirs="$dirs $subsys"
-+  fi
- fi
- 
- for foo in $dirs; do
-@@ -253,7 +263,11 @@
- 
- # Make the link tree in which to actually build.
- if [ x$nolinks = x ]; then
--  make links
-+  if [ x$subsys = x ]; then
-+    make links
-+  else
-+    make links.$subsys
-+  fi
- fi
- 
- exit 0
diff --git a/net/isc-dhcp30-server/files/patch-dhcpctl::Makefile.dist b/net/isc-dhcp30-server/files/patch-dhcpctl::Makefile.dist
deleted file mode 100644
index acfee5854413..000000000000
--- a/net/isc-dhcp30-server/files/patch-dhcpctl::Makefile.dist
+++ /dev/null
@@ -1,79 +0,0 @@
---- dhcpctl/Makefile.dist.orig	Mon Apr 28 16:31:57 2003
-+++ dhcpctl/Makefile.dist	Mon Apr 28 16:24:20 2003
-@@ -17,11 +17,11 @@
- # http://www.isc.org for more information.
- #
- 
--CATMANPAGES = dhcpctl.cat3 omshell.cat1
--SEDMANPAGES = dhcpctl.man3 omshell.man1
-+CATMANPAGES = dhcpctl.cat3
-+SEDMANPAGES = dhcpctl.man3
- SRC    = dhcpctl.c callback.c remote.c
- OBJ    = dhcpctl.o callback.o remote.o
--MAN    = dhcpctl.3 omshell.1
-+MAN    = dhcpctl.3
- HDRS   = dhcpctl.h
- 
- INCLUDES = $(BINDINC) -I$(TOP)/includes
-@@ -29,10 +29,7 @@
- DHCPCTLLIBS = libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \
- 		../omapip/libomapi.a ../dst/libdst.a
- 
--all:	libdhcpctl.a omshell cltest $(CATMANPAGES)
--
--omshell:	omshell.o $(DHCPCTLLIBS)
--	$(CC) $(DEBUG) $(LFLAGS) -o omshell omshell.o $(DHCPCTLLIBS) $(LIBS)
-+all:	libdhcpctl.a cltest $(CATMANPAGES)
- 
- cltest:	cltest.o $(DHCPCTLLIBS)
- 	$(CC) $(DEBUG) $(LFLAGS) -o cltest cltest.o $(DHCPCTLLIBS) $(LIBS)
-@@ -43,8 +40,7 @@
- 	$(RANLIB) libdhcpctl.a
- 
- install: all $(CATMANPAGES)
--	for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR) $(USRMANDIR) \
--		$(USERBINDIR); do \
-+	for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR); do \
- 	  foo=""; \
- 	  for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
- 	    foo=$${foo}/$$bar; \
-@@ -64,16 +60,12 @@
- 	  $(MANINSTALL) $(MANFROM) $${prefix}.$(MANCAT)$${suffix} $(MANTO) \
- 			$(DESTDIR)$(LIBMANDIR)/$${prefix}$(LIBMANEXT); \
- 	done
--	$(INSTALL) omshell $(DESTDIR)$(USERBINDIR)
--	$(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell
--	$(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \
--				$(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT)
- 
- depend:
- 	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC)
- 
- clean:
--	-rm -f $(OBJ) test.o svtest cltest.o cltest
-+	-rm -f $(OBJ) cltest.o cltest
- 
- realclean: clean
- 	-rm -f libdhcpctl.a *~ $(CATMANPAGES) $(SEDMANPAGES)
-@@ -82,7 +74,7 @@
- 	-rm -f Makefile
- 
- links:
--	@for foo in $(SRC) $(MAN) omshell.c cltest.c $(HDRS); do \
-+	@for foo in $(SRC) $(MAN) cltest.c $(HDRS); do \
- 	  if [ ! -b $$foo ]; then \
- 	    rm -f $$foo; \
- 	  fi; \
-@@ -95,12 +87,5 @@
- dhcpctl.man3:	dhcpctl.3
- 	sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
- 		-e "s#RUNDIR#$(VARRUN)#g" < dhcpctl.3 >dhcpctl.man3
--
--omshell.cat1:	omshell.man1
--	nroff -man omshell.man1 >omshell.cat1
--
--omshell.man1:	omshell.1
--	sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
--		-e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1
- 
- # Dependencies (semi-automatically-generated)
diff --git a/net/isc-dhcp30-server/files/patch-dhcpd.conf b/net/isc-dhcp30-server/files/patch-dhcpd.conf
deleted file mode 100644
index 030e89874d8d..000000000000
--- a/net/isc-dhcp30-server/files/patch-dhcpd.conf
+++ /dev/null
@@ -1,12 +0,0 @@
---- server/dhcpd.conf.orig	Thu Jan 25 03:33:11 2001
-+++ server/dhcpd.conf	Wed Jan 30 22:06:52 2002
-@@ -14,6 +14,9 @@
- # network, the authoritative directive should be uncommented.
- #authoritative;
- 
-+# ad-hoc DNS update scheme - set to "none" to disable dynamic DNS updates.
-+ddns-update-style ad-hoc;
-+
- # Use this to send dhcp log messages to a different log file (you also
- # have to hack syslog.conf to complete the redirection).
- log-facility local7;
diff --git a/net/isc-dhcp30-server/files/patch-dst::Makefile.dist b/net/isc-dhcp30-server/files/patch-dst::Makefile.dist
deleted file mode 100644
index ad45436b1629..000000000000
--- a/net/isc-dhcp30-server/files/patch-dst::Makefile.dist
+++ /dev/null
@@ -1,29 +0,0 @@
---- dst/Makefile.dist.orig	Sun Nov 17 03:27:43 2002
-+++ dst/Makefile.dist	Fri Mar  5 23:40:45 2004
-@@ -26,12 +26,24 @@
- 
- all:	libdst.a
- 
--install:
--
- libdst.a:	$(OBJ)
- 	rm -f dst.a
- 	ar cruv libdst.a $(OBJ)
- 	$(RANLIB) libdst.a
-+
-+install: all
-+	for dir in $(LIBDIR);\
-+	 do \
-+	  foo=""; \
-+	  for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
-+	    foo=$${foo}/$$bar; \
-+	    if [ ! -d $$foo ]; then \
-+	      mkdir $$foo; \
-+	      chmod 755 $$foo; \
-+	    fi; \
-+	  done; \
-+	done
-+	$(INSTALL) libdst.a $(DESTDIR)$(LIBDIR)
- 
- depend:
- 	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC)
diff --git a/net/isc-dhcp30-server/files/patch-freebsd b/net/isc-dhcp30-server/files/patch-freebsd
deleted file mode 100644
index 9fef4fdab877..000000000000
--- a/net/isc-dhcp30-server/files/patch-freebsd
+++ /dev/null
@@ -1,75 +0,0 @@
---- client/scripts/freebsd.orig	Sun Apr 27 21:44:01 2003
-+++ client/scripts/freebsd	Wed Mar  3 02:28:29 2004
-@@ -16,7 +16,7 @@
-       ( echo search $new_domain_name >/etc/resolv.conf )
-       exit_status=$?
-     else
--      rm /etc/resolv.conf
-+      ( rm /etc/resolv.conf )
-       exit_status=$?
-     fi
-     if [ $exit_status -ne 0 ]; then
-@@ -32,17 +32,17 @@
- # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
- exit_with_hooks() {
-   exit_status=$1
--  if [ -f /etc/dhclient-exit-hooks ]; then
--    . /etc/dhclient-exit-hooks
-+  if [ -f %%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 [ -f /etc/dhclient-enter-hooks ]; then
-+if [ -f %%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
-@@ -51,11 +51,11 @@
- fi
- 
- if [ x$new_network_number != x ]; then
--   $LOGGER New Network Number: $new_network_number
-+  $LOGGER "New Network Number: $new_network_number"
- fi
- 
- if [ x$new_broadcast_address != x ]; then
-- $LOGGER New Broadcast Address: $new_broadcast_address
-+  $LOGGER "New Broadcast Address: $new_broadcast_address"
-   new_broadcast_arg="broadcast $new_broadcast_address"
- fi
- if [ x$old_broadcast_address != x ]; then
-@@ -71,6 +71,15 @@
-   alias_subnet_arg="netmask $alias_subnet_mask"
- fi
- 
-+# Get the interface to which our default route is bound to.
-+if [ -x /usr/bin/netstat ]; then
-+	if_defaultroute=`/usr/bin/netstat -rn \
-+		| /usr/bin/grep "^default" \
-+		| /usr/bin/awk '{print $6}'`
-+else
-+	if_defaultroute=""
-+fi
-+
- if [ x$reason = xMEDIUM ]; then
-   eval "ifconfig $interface $medium"
-   eval "ifconfig $interface inet -alias 0.0.0.0 $medium" >/dev/null 2>&1
-@@ -113,7 +122,10 @@
-     eval "ifconfig $interface inet -alias $old_ip_address $medium"
-     route delete $old_ip_address 127.1 >/dev/null 2>&1
-     for router in $old_routers; do
--      route delete default $router >/dev/null 2>&1
-+	if [ x$if_defaultroute = x ] || [ x$if_defaultroute = x$interface ]
-+	 then
-+	      route delete default $router >/dev/null 2>&1
-+	fi
-     done
-     if [ -n "$old_static_routes" ]; then
-       set -- $old_static_routes
diff --git a/net/isc-dhcp30-server/files/patch-includes::cf::freebsd.h b/net/isc-dhcp30-server/files/patch-includes::cf::freebsd.h
deleted file mode 100644
index 9a3f4c636b09..000000000000
--- a/net/isc-dhcp30-server/files/patch-includes::cf::freebsd.h
+++ /dev/null
@@ -1,62 +0,0 @@
---- includes/cf/freebsd.h.orig	Wed Mar  3 02:32:39 2004
-+++ includes/cf/freebsd.h	Wed Mar  3 02:31:56 2004
-@@ -42,7 +42,7 @@
-  */
- 
- #include <syslog.h>
--#include <sys/types.h>
-+#include <sys/param.h>
- #include <string.h>
- #include <paths.h>
- #include <errno.h>
-@@ -101,6 +101,10 @@
- #define SOCKLEN_T int
- #endif
- 
-+#ifdef RESCUE
-+#define _PATH_DHCLIENT_SCRIPT	"/rescue/dhclient-script"
-+#endif
-+
- #if defined (USE_DEFAULT_NETWORK)
- #  define USE_BPF
- #endif
-@@ -111,6 +115,9 @@
-  #endif /* HAVE_DEV_RANDOM */
- 
- const char *cmds[] = {
-+#ifndef RESCUE
-+	/* rescue environment can't rely on these ... */
-+	/* Actually, /sbin/dhclient shouldn't use these, either. */
- 	"/bin/ps -axlw 2>&1",
- 	"/usr/sbin/arp -an 2>&1",
- 	"/usr/bin/netstat -an 2>&1",
-@@ -121,10 +128,12 @@
- 	"/usr/sbin/iostat  2>&1",
- 	"/usr/bin/vmstat  2>&1",
- 	"/usr/bin/w  2>&1",
-+#endif
- 	NULL
- };
- 
- const char *dirs[] = {
-+#ifndef RESCUE
- 	"/tmp",
- 	"/usr/tmp",
- 	".",
-@@ -134,13 +143,16 @@
- 	"/var/mail",
- 	"/home",
- 	"/usr/home",
-+#endif
- 	NULL
- };
- 
- const char *files[] = {
-+#ifndef RESCUE
- 	"/var/log/messages",
- 	"/var/log/wtmp",
- 	"/var/log/lastlog",
-+#endif
- 	NULL
- };
- #endif /* NEED_PRAND_CONF */
diff --git a/net/isc-dhcp30-server/files/patch-includes::dhcpd.h b/net/isc-dhcp30-server/files/patch-includes::dhcpd.h
deleted file mode 100644
index 1933e0b4037a..000000000000
--- a/net/isc-dhcp30-server/files/patch-includes::dhcpd.h
+++ /dev/null
@@ -1,56 +0,0 @@
---- includes/dhcpd.h.orig	Mon Feb 10 02:22:46 2003
-+++ includes/dhcpd.h	Wed Mar  3 16:20:09 2004
-@@ -99,6 +99,9 @@
- 	 (((x) >> OPTION_HASH_EXP) & \
- 	  (OPTION_HASH_PTWO - 1))) % OPTION_HASH_SIZE;
- 
-+#define NOLINK 0
-+#define HAVELINK 1
-+
- enum dhcp_shutdown_state {
- 	shutdown_listeners,
- 	shutdown_omapi_connections,
-@@ -783,6 +786,11 @@
- 	unsigned remote_id_len;		/* Length of Remote ID. */
- 
- 	char name [IFNAMSIZ];		/* Its name... */
-+	int ieee80211;                  /* True if media is ieee802.11 */
-+	int havemedia;                  /* True if we have a media table */
-+	int linkstate;                  /* True if we have link */
-+	int polling;                    /* True if polling is enabled */
-+	int forcediscover;              /* True if a discover is needed */
- 	int index;			/* Its index. */
- 	int rfdesc;			/* Its read file descriptor. */
- 	int wfdesc;			/* Its write file descriptor, if
-@@ -1845,6 +1853,9 @@
- extern const char *path_dhclient_pid;
- extern char *path_dhclient_script;
- extern int interfaces_requested;
-+#ifdef ENABLE_POLLING_MODE
-+extern int polling_interval;
-+#endif
- 
- extern struct client_config top_level_config;
- 
-@@ -1858,12 +1869,21 @@
- void send_decline PROTO ((void *));
- 
- void state_reboot PROTO ((void *));
-+#ifdef ENABLE_POLLING_MODE
-+void state_background PROTO ((void *));
-+void state_polling PROTO ((void *));
-+#endif
- void state_init PROTO ((void *));
- void state_selecting PROTO ((void *));
- void state_requesting PROTO ((void *));
- void state_bound PROTO ((void *));
- void state_stop PROTO ((void *));
- void state_panic PROTO ((void *));
-+
-+#if __FreeBSD_version > 502010
-+void set_ieee80211 PROTO ((struct interface_info *));
-+#endif
-+int interface_active PROTO ((struct interface_info *));
- 
- void bind_lease PROTO ((struct client_state *));
- 
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 1149e0c7925c..000000000000
--- a/net/isc-dhcp30-server/files/patch-site.conf
+++ /dev/null
@@ -1,42 +0,0 @@
---- site.conf.orig	Wed Jul  7 17:20:10 1999
-+++ site.conf	Wed Mar  3 14:00:14 2004
-@@ -1,2 +1,39 @@
- # Put local site configuration stuff here to override the default
- # settings in Makefile.conf
-+
-+PREFIX ?=	/usr/local
-+
-+USERBINDIR =	$(PREFIX)/bin
-+BINDIR =	$(PREFIX)/sbin
-+CLIENTBINDIR =	$(PREFIX)/sbin
-+ADMMANDIR =	$(PREFIX)/man/man8
-+ADMMANEXT =	.8
-+FFMANDIR =	$(PREFIX)/man/man5
-+FFMANEXT =	.5
-+LIBMANDIR =	$(PREFIX)/man/man3
-+LIBMANEXT =	.3
-+USRMANDIR =	$(PREFIX)/man/man1
-+USRMANEXT =	.1
-+MANCAT =	man
-+# INSTALL =	${INSTALL_DATA}
-+# MANINSTALL =	${INSTALL_MAN}
-+ETC =		$(PREFIX)/etc
-+LIBDIR =	${PREFIX}/lib
-+INCDIR =	${PREFIX}/include
-+CLIENT_PATH =	\"PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin\"
-+
-+DEBUG ?=	#none
-+
-+CFLAGS +=	-D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\"
-+CFLAGS +=	-D_PATH_DHCPD_DB=\"$(VARDB)/dhcpd.leases\"
-+CFLAGS +=	-D_PATH_DHCPD_PID=\"$(VARRUN)/dhcpd.pid\"
-+
-+CFLAGS +=	-D_PATH_DHCRELAY_PID=\"$(VARRUN)/dhcrelay.pid\"
-+
-+CFLAGS +=	-D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\"
-+CFLAGS +=	-D_PATH_DHCLIENT_SCRIPT=\"$(CLIENTBINDIR)/dhclient-script\"
-+CFLAGS +=	-D_PATH_DHCLIENT_DB=\"$(VARDB)/dhclient.leases\"
-+CFLAGS +=	-D_PATH_DHCLIENT_PID=\"$(VARRUN)/dhclient.pid\"
-+
-+CFLAGS +=	-Dwarn=dhcp_warn
-+CFLAGS +=	-DNOMINUM
diff --git a/net/isc-dhcp30-server/pkg-descr b/net/isc-dhcp30-server/pkg-descr
deleted file mode 100644
index 86bbb3cc62f0..000000000000
--- a/net/isc-dhcp30-server/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides a
-freely redistributable reference implementation of all aspects of the
-DHCP protocol, through a suite of DHCP tools:
-
-  * A DHCP server (this port)
-  * A DHCP client
-  * A DHCP relay agent
-
-Version 3 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. 
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp30-server/pkg-message b/net/isc-dhcp30-server/pkg-message
deleted file mode 100644
index 02c3fad98765..000000000000
--- a/net/isc-dhcp30-server/pkg-message
+++ /dev/null
@@ -1,15 +0,0 @@
-****  To setup dhcpd, you may have to copy %%PREFIX%%/etc/dhcpd.conf.sample
-      to %%PREFIX%%/etc/dhcpd.conf for editing.
-
-****  This port installs dhcp daemon, but don't invokes dhcpd by default. If
-      you want to invoke dhcpd at startup, put these lines into /etc/rc.conf.
-
-	    dhcpd_enable="YES"
-	    dhcpd_flags=""				# command option(s)
-	    dhcpd_conf="%%PREFIX%%/etc/dhcpd.conf"	# configuration file
-	    dhcpd_ifaces=""				# ethernet interface(s)
-
-****  For instance, rc.conf like variables are still read from
-      %%PREFIX%%/etc/rc.isc-dhcpd.conf. They should be move into
-      /etc/rc.conf.  Also, the dhcpd_options variable must be
-      renamed dhcpd_flags.
diff --git a/net/isc-dhcp30-server/pkg-plist b/net/isc-dhcp30-server/pkg-plist
deleted file mode 100644
index 3212362358fa..000000000000
--- a/net/isc-dhcp30-server/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $FreeBSD$
-bin/omshell
-etc/dhcpd.conf.sample
-etc/rc.d/isc-dhcpd.sh
-sbin/dhcpd
-%%PORTDOCS%%%%DOCSDIR%%/ANONCVS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec [ -f /var/db/dhcpd.leases ] || touch /var/db/dhcpd.leases
-@unexec [ -s /var/db/dhcpd.leases ] || rm -f /var/db/dhcpd.leases
diff --git a/net/isc-dhcp31-client/Makefile b/net/isc-dhcp31-client/Makefile
deleted file mode 100644
index 4b52a17c9736..000000000000
--- a/net/isc-dhcp31-client/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:    dhcp
-# Date created:         28 April 2003
-# Whom:                 cyrille.lefevre@laposte.net
-#
-# $FreeBSD$
-#
-
-MAINTAINER=	cyrille.lefevre@laposte.net
-COMMENT=	The ISC Dynamic Host Configuration Protocol client
-
-# Local variables
-#
-
-SUBSYS=		client
-
-# Local overrides
-#
-
-MASTERDIR=	${.CURDIR}/../isc-dhcp3-server
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/isc-dhcp31-client/pkg-descr b/net/isc-dhcp31-client/pkg-descr
deleted file mode 100644
index 7dc1bc78ea95..000000000000
--- a/net/isc-dhcp31-client/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides a
-freely redistributable reference implementation of all aspects of the
-DHCP protocol, through a suite of DHCP tools:
-
-  * A DHCP server
-  * A DHCP client (this port)
-  * A DHCP relay agent
-
-Version 3 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. 
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp31-client/pkg-message b/net/isc-dhcp31-client/pkg-message
deleted file mode 100644
index b406fd04fbd8..000000000000
--- a/net/isc-dhcp31-client/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-****  To setup dhclient, you may need to edit /etc/rc.conf to replace the
-      base system dhclient, such as :
-
-	    dhcp_program="%%PREFIX%%/sbin/dhclient"
-	    dhcp_flags="-q"
-
-      See dhclient(8), using the following command, for details about other
-      possible options:
-
-	    MANPATH=%%MAN1PREFIX%%/man man 8 dhclient
diff --git a/net/isc-dhcp31-client/pkg-plist b/net/isc-dhcp31-client/pkg-plist
deleted file mode 100644
index 489e362026b0..000000000000
--- a/net/isc-dhcp31-client/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp31-client/Attic/pkg-plist,v 1.2 2004-03-05 22:03:02 sergei Exp $
-etc/dhclient.conf.sample
-@exec [ -f %D/etc/dhclient.conf ] || touch %D/etc/dhclient.conf
-@unexec [ -L %D/etc/dhclient.conf -o -s %D/etc/dhclient.conf ] || rm -f %D/etc/dhclient.conf
-sbin/dhclient
-sbin/dhclient-script
-%%PORTDOCS%%%%DOCSDIR%%/ANONCVS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec [ -f /var/run/dhclient.leases ] || touch /var/run/dhclient.leases
-@unexec [ -s /var/run/dhclient.leases ] || rm -f /var/run/dhclient.leases
diff --git a/net/isc-dhcp31-relay/Makefile b/net/isc-dhcp31-relay/Makefile
deleted file mode 100644
index e7626329f2ca..000000000000
--- a/net/isc-dhcp31-relay/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:    dhcp
-# Date created:         28 April 2003
-# Whom:                 cyrille.lefevre@laposte.net
-#
-# $FreeBSD$
-#
-
-MAINTAINER=	cyrille.lefevre@laposte.net
-COMMENT=	The ISC Dynamic Host Configuration Protocol relay
-
-# Local variables
-#
-
-SUBSYS=		relay
-
-# Local overrides
-#
-
-MASTERDIR=	${.CURDIR}/../isc-dhcp3-server
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/isc-dhcp31-relay/pkg-descr b/net/isc-dhcp31-relay/pkg-descr
deleted file mode 100644
index b764dbf45a19..000000000000
--- a/net/isc-dhcp31-relay/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides a
-freely redistributable reference implementation of all aspects of the
-DHCP protocol, through a suite of DHCP tools:
-
-  * A DHCP server
-  * A DHCP client
-  * A DHCP relay agent (this port)
-
-Version 3 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. 
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp31-relay/pkg-message b/net/isc-dhcp31-relay/pkg-message
deleted file mode 100644
index af6992fb34a5..000000000000
--- a/net/isc-dhcp31-relay/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-****  This port installs dhcp relay daemon, but don't invokes dhcrelay by
-      default. If you want to invoke dhcrelay at startup, put these lines
-      into /etc/rc.conf.
-
-	    dhcrelay_enable="YES"
-	    dhcrelay_flags=""		# command option(s)
-	    dhcrelay_servers=""		# dhcrelay server(s)
-	    dhcrelay_ifaces=""		# ethernet interface(s)
-
-****  For instance, rc.conf like variables are still read from
-      %%PREFIX%%/etc/rc.isc-dhcrelay.conf. They should be move
-      into /etc/rc.conf. Also, the dhcrelay_options variable
-      must be renamed dhcrelay_flags.
diff --git a/net/isc-dhcp31-relay/pkg-plist b/net/isc-dhcp31-relay/pkg-plist
deleted file mode 100644
index 0c81235a4ba7..000000000000
--- a/net/isc-dhcp31-relay/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp31-relay/Attic/pkg-plist,v 1.3 2004-03-16 20:31:14 des Exp $
-etc/rc.d/isc-dhcrelay.sh
-sbin/dhcrelay
-%%PORTDOCS%%%%DOCSDIR%%/ANONCVS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
deleted file mode 100644
index 291e831481f3..000000000000
--- a/net/isc-dhcp31-server/Makefile
+++ /dev/null
@@ -1,243 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:    dhcp
-# Date created:         7 Mar 1996
-# Whom:                 se
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dhcp
-PORTVERSION=	3.0.1.r12
-PORTREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
-PKGNAMEPREFIX=	isc-
-PKGNAMESUFFIX=	3-${SUBSYS}
-DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
-
-MAINTAINER=	cyrille.lefevre@laposte.net
-COMMENT?=	The ISC Dynamic Host Configuration Protocol server
-
-USE_REINPLACE=	yes
-USE_RC_SUBR=	yes
-
-.include <bsd.port.pre.mk>
-
-# Global variables
-#
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--subsys ${SUBSYS}
-ALL_TARGET=	all.${SUBSYS}
-INSTALL_TARGET=	install.${SUBSYS}
-
-SUBSYS?=	server
-
-.if ${SUBSYS} == client
-MAN5=		dhclient.conf.5 dhclient.leases.5
-MAN8=		dhclient.8 dhclient-script.8
-.elif ${SUBSYS} == server
-MAN1=		omshell.1
-MAN5=		dhcpd.conf.5 dhcpd.leases.5
-MAN8=		dhcpd.8
-.elif ${SUBSYS} == relay
-MAN8=		dhcrelay.8
-.else
-MAN3=		dhcpctl.3 omapi.3
-.endif
-.if ${SUBSYS} != relay
-MAN5+=		dhcp-eval.5 dhcp-options.5
-.endif
-
-MSG_FILE=	${.CURDIR}/pkg-message
-DESCR=		${.CURDIR}/pkg-descr
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PLIST=		${.CURDIR}/pkg-plist
-
-# Local variables
-#
-
-# for instance, possible versions are:
-#	1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2
-# which have to become:
-#	1.2rc3pl4 (or 1.2beta3pl4), 1.2rc3 (or 1.2beta3), 1.2pl3, 1.2
-# so, the magic things are:
-VERSION=
-PATCHLEVEL=
-.if ${PORTVERSION:R:E:M[br]*} != ""
-RELEASE=	${PORTVERSION:R:R}
-VERSION=	${PORTVERSION:R:E:S/b/beta/:S/r/rc/}
-PATCHLEVEL=	pl${PORTVERSION:E}
-.elif ${PORTVERSION:E:M[br]*} != ""
-RELEASE=	${PORTVERSION:R}
-VERSION=	${PORTVERSION:E:S/b/beta/:S/r/rc/}
-.elif ${PORTVERSION:R:E} != ""
-RELEASE=	${PORTVERSION:R}
-PATCHLEVEL=	pl${PORTVERSION:E}
-.else
-RELEASE=	${PORTVERSION}
-.endif
-
-PATCH_SUBDIRS=	common minires dst omapip
-.if ${SUBSYS} == server || ${SUBSYS} == devel
-PATCH_SUBDIRS+=	dhcpctl
-.endif
-.if ${SUBSYS} != devel
-PATCH_SUBDIRS+=	${SUBSYS}
-.endif
-.if ${SUBSYS} == server
-PATCH_SUBDIRS+=	omshell
-.endif
-
-.if ${SUBSYS} == client
-BIN_FILES=	dhclient
-CONF_FILES=	dhclient.conf
-SAMP_FILES=	client/dhclient.conf
-DATA_FILES=	dhclient.leases
-.elif ${SUBSYS} == server
-BIN_FILES=	dhcpd omshell
-RC_FILES=	isc-dhcpd
-SAMP_FILES=	server/dhcpd.conf
-DATA_FILES=	dhcpd.leases
-.elif ${SUBSYS} == relay
-BIN_FILES=	dhcrelay
-RC_FILES=	isc-dhcrelay
-.endif
-DOC_FILES=	ANONCVS CHANGES COPYRIGHT README RELNOTES
-
-SAMP_SUFX=	.sample
-
-CONF_DIR=	${PREFIX}/etc
-RC_DIR=		${PREFIX}/etc/rc.d
-DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
-DATADIR=	/var/db
-
-REINPLACE_SUB=	PREFIX=${PREFIX}
-RCSCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
-PKGMESSAGE_SUB=	PREFIX=${PREFIX} MAN1PREFIX=${MAN1PREFIX}
-
-# Pre-everything
-#
-
-.if ${SUBSYS} == client && !defined(WITHOUT_INTERFACE_POLLING)
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile without interface polling support."
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_INTERFACE_POLLING=yes\""
-	@${ECHO_MSG}
-.endif
-
-# Post-extract
-#
-
-post-extract: extract-omshell
-
-extract-omshell:
-	@${MKDIR} ${WRKSRC}/omshell
-	@${MV} ${WRKSRC}/dhcpctl/omshell.? ${WRKSRC}/omshell
-	@${CP} ${FILESDIR}/omshell::Makefile.dist \
-		${WRKSRC}/omshell/Makefile.dist
-
-# Post-patch
-#
-
-post-patch: patch-scripts patch-makefile-conf \
-	    patch-makefiles-dist patch-man-pages \
-	    patch-pkgmessage patch-site-conf \
-	    patch-rc-scripts
-
-patch-scripts:
-	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${WRKSRC}/client/dhclient.conf \
-		${WRKSRC}/client/scripts/freebsd
-
-patch-site-conf:
-.if ${SUBSYS} == client && !defined(WITHOUT_INTERFACE_POLLING)
-	@${ECHO_CMD} CFLAGS += -DENABLE_POLLING_MODE >> ${WRKSRC}/site.conf
-.endif
-
-patch-makefile-conf:
-	@${REINPLACE_CMD} -e 's|^DEBUG[ 	]*=|# DEBUG ?=|g' \
-		${WRKSRC}/Makefile.conf
-
-patch-makefiles-dist:
-.for subdir in ${PATCH_SUBDIRS}
-	@${REINPLACE_CMD} -e 's|^CFLAGS[ 	]*=|CFLAGS +=|g' \
-		${WRKSRC}/${subdir}/Makefile.dist
-.endfor
-
-# temporary hack - no patch file needed for this typo.
-patch-man-pages:
-	@${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3
-
-patch-rc-scripts:
-.for f in ${RC_FILES}
-	@${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/${f}.sh${SAMP_SUFX} > ${WRKDIR}/${f}.sh
-.endfor
-
-patch-pkgmessage:
-.if ${SUBSYS} != devel
-	@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${MSG_FILE} > ${PKGMESSAGE}
-.endif
-
-# Post-install
-#
-
-post-install: strip-binary-files install-startup-files \
-	      install-doc-files install-sample-files \
-	      create-conf-files create-data-files \
-	      display-message
-
-strip-binary-files:
-.for f in ${BIN_FILES}
-.if exists(${PREFIX}/bin/${f})
-	@${STRIP_CMD} ${PREFIX}/bin/${f}
-.endif
-.if exists(${PREFIX}/sbin/${f})
-	@${STRIP_CMD} ${PREFIX}/sbin/${f}
-.endif
-.endfor
-
-install-startup-files:
-.for f in ${RC_FILES}
-	@${INSTALL_SCRIPT} ${WRKDIR}/${f}.sh ${RC_DIR}
-.endfor
-
-install-doc-files:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for f in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
-
-install-sample-files:
-.for f in ${SAMP_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${CONF_DIR}/${f:T}${SAMP_SUFX}
-.endfor
-
-create-conf-files:
-.for f in ${CONF_FILES}
-.if !exists(${CONF_DIR}/${f})
-	@${TOUCH} ${CONF_DIR}/${f}
-.endif
-.endfor
-
-create-data-files:
-.for f in ${DATA_FILES}
-.if !exists(${DATADIR}/${f})
-	@${TOUCH} ${DATADIR}/${f}
-.endif
-.endfor
-
-display-message:
-.if ${SUBSYS} != devel
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/isc-dhcp31-server/distinfo b/net/isc-dhcp31-server/distinfo
deleted file mode 100644
index a806bc46fa23..000000000000
--- a/net/isc-dhcp31-server/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (dhcp-3.0.1rc12.tar.gz) = cf00193dcf349c888a62e4462ae1eb9c
-SIZE (dhcp-3.0.1rc12.tar.gz) = 857323
diff --git a/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample
deleted file mode 100644
index 63bc57ba0f3d..000000000000
--- a/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: dhcpd
-# REQUIRE: DAEMON
-# KEYWORD: FreeBSD
-#
-# Add the following line to /etc/rc.conf to enable dhcpd:
-#
-# dhcpd_enable="YES"
-#
-
-# override these variables in /etc/rc.conf
-dhcpd_enable=NO
-dhcpd_flags=				# command option(s)
-dhcpd_conf=%%PREFIX%%/etc/dhcpd.conf	# configuration file
-dhcpd_ifaces=				# ethernet interface(s)
-
-dhcpd_precmd ()
-{
-	dhcpd_rcconf=%%PREFIX%%/etc/rc.isc-dhcpd.conf
-
-	if [ -f ${dhcpd_rcconf} ]; then
-		warn "${dhcpd_rcconf} is obsolete, use /etc/rc.conf instead."
-		. ${dhcpd_rcconf}
-
-		if [ -n "${dhcpd_options}" -a -z "${rc_flags}" ]; then
-			warn "dhcpd_options is obsolete, use dhcpd_flags instead."
-			rc_flags=${dhcpd_options}
-		fi
-	fi
-
-	rc_flags="${rc_flags} -cf ${dhcpd_conf} ${dhcpd_ifaces}"
-}
-
-. %%RC_SUBR%%
-
-name=dhcpd
-rcvar=$(set_rcvar)
-
-command=%%PREFIX%%/sbin/${name}
-pidfile=/var/run/${name}.pid
-required_files=${dhcpd_conf}
-start_precmd=${name}_precmd
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample
deleted file mode 100644
index 4302d7360ff1..000000000000
--- a/net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: dhcrelay
-# REQUIRE: DAEMON
-# KEYWORD: FreeBSD
-#
-# Add the following line to /etc/rc.conf to enable dhcrelay:
-#
-# dhcrelay_enable="YES"
-#
-
-# override these variables in /etc/rc.conf
-dhcrelay_enable=NO
-dhcrelay_flags=				# command option(s)
-dhcrelay_servers=			# dhcrelay server(s)
-dhcrelay_ifaces=			# ethernet interface(s)
-
-dhcrelay_precmd ()
-{
-	local ifaces
-
-	dhcrelay_rcconf=%%PREFIX%%/etc/rc.isc-dhcrelay.conf
-
-	if [ -f ${dhcrelay_rcconf} ]; then
-		warn "${dhcrelay_rcconf} is obsolete, use /etc/rc.conf instead."
-		. ${dhcrelay_rcconf}
-
-		if [ -n "${dhcrelay_options}" -a -z "${rc_flags}" ]; then
-			warn "dhcrelay_options is obsolete, use dhcrelay_flags instead."
-			rc_flags=${dhcrelay_options}
-		fi
-	fi
-
-	if [ -z "${dhcrelay_servers}" ]; then
-		err 1 "no dhcrelay server(s) configured."
-	fi
-
-	ifaces=
-	for iface in ${dhcrelay_ifaces}; do
-		ifaces="${ifaces} -i ${iface}"
-	done
-
-	rc_flags="${rc_flags} ${ifaces} ${dhcrelay_servers}"
-}
-
-. %%RC_SUBR%%
-
-name=dhcrelay
-rcvar=$(set_rcvar)
-
-command=%%PREFIX%%/sbin/${name}
-pidfile=/var/run/${name}.pid
-start_precmd=${name}_precmd
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/net/isc-dhcp31-server/files/omshell::Makefile.dist b/net/isc-dhcp31-server/files/omshell::Makefile.dist
deleted file mode 100644
index 34c90a2e7f53..000000000000
--- a/net/isc-dhcp31-server/files/omshell::Makefile.dist
+++ /dev/null
@@ -1,80 +0,0 @@
-# Makefile.dist
-#
-# Copyright (c) 1996-2002 Internet Software Consortium.
-# Use is subject to license terms which appear in the file named
-# ISC-LICENSE that should have accompanied this file when you
-# received it.   If a file named ISC-LICENSE did not accompany this
-# file, or you are not sure the one you have is correct, you may
-# obtain an applicable copy of the license at:
-#
-#             http://www.isc.org/isc-license-1.0.html. 
-#
-# This file is part of the ISC DHCP distribution.   The documentation
-# associated with this file is listed in the file DOCUMENTATION,
-# included in the top-level directory of this release.
-#
-# Support and other services are available for ISC products - see
-# http://www.isc.org for more information.
-#
-
-CATMANPAGES = omshell.cat1
-SEDMANPAGES = omshell.man1
-SRCS   = omshell.c
-OBJS   = omshell.o
-PROG   = omshell
-MAN    = omshell.1
-
-INCLUDES = -I$(TOP)/dhcpctl $(BINDINC) -I$(TOP)/includes
-CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
-DHCPCTLLIBS = ../dhcpctl/libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \
-		../omapip/libomapi.a ../dst/libdst.a
-
-all:	$(PROG) $(CATMANPAGES)
-
-$(PROG):	$(OBJS) $(DHCPCTLLIBS)
-	$(CC) $(DEBUG) $(LFLAGS) -o $(PROG) $(OBJS) $(DHCPCTLLIBS) $(LIBS)
-
-install: all $(CATMANPAGES)
-	for dir in $(USRMANDIR) $(USERBINDIR); do \
-	  foo=""; \
-	  for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
-	    foo=$${foo}/$$bar; \
-	    if [ ! -d $$foo ]; then \
-	      mkdir $$foo; \
-	      chmod 755 $$foo; \
-	    fi; \
-	  done; \
-	done
-	$(INSTALL) omshell $(DESTDIR)$(USERBINDIR)
-	$(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell
-	$(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \
-				$(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT)
-
-depend:
-	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS)
-
-clean:
-	-rm -f $(OBJS)
-
-realclean: clean
-	-rm -f $(PROG) *~ $(CATMANPAGES) $(SEDMANPAGES) #*
-
-distclean: realclean
-	-rm -f Makefile
-
-links:
-	@for foo in $(SRCS) $(MAN); do \
-	  if [ ! -b $$foo ]; then \
-	    rm -f $$foo; \
-	  fi; \
-	  ln -s $(TOP)/omshell/$$foo $$foo; \
-	done
-
-omshell.cat1:	omshell.man1
-	nroff -man omshell.man1 >omshell.cat1
-
-omshell.man1:	omshell.1
-	sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
-		-e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1
-
-# Dependencies (semi-automatically-generated)
diff --git a/net/isc-dhcp31-server/files/patch-Makefile b/net/isc-dhcp31-server/files/patch-Makefile
deleted file mode 100644
index 7a8df08b137b..000000000000
--- a/net/isc-dhcp31-server/files/patch-Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
---- Makefile.orig	Fri Nov  8 00:10:07 2002
-+++ Makefile	Mon Apr 28 15:04:50 2003
-@@ -38,59 +38,59 @@
- # ``http://www.nominum.com''.
- #
- 
--all:
-+all all.devel all.server all.relay all.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make all); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--install:
-+install install.devel install.server install.relay install.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make install); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--depend:
-+depend depend.devel depend.server depend.relay depend.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make depend); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--clean:
-+clean clean.devel clean.server clean.relay clean.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make clean); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--realclean:
-+realclean realclean.devel realclean.server realclean.relay realclean.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make realclean); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--distclean:
-+distclean distclean.devel distclean.server distclean.relay distclean.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make distclean); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--links:
-+links links.devel links.server links.relay links.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make links); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
diff --git a/net/isc-dhcp31-server/files/patch-Makefile.dist b/net/isc-dhcp31-server/files/patch-Makefile.dist
deleted file mode 100644
index 9edab8fa4571..000000000000
--- a/net/isc-dhcp31-server/files/patch-Makefile.dist
+++ /dev/null
@@ -1,243 +0,0 @@
---- Makefile.dist.orig	Fri Nov  8 00:10:08 2002
-+++ Makefile.dist	Tue Apr 29 00:07:43 2003
-@@ -3,13 +3,13 @@
- # Copyright (c) 1996-2002 Internet Software Consortium.
- # Use is subject to license terms which appear in the file named
- # ISC-LICENSE that should have accompanied this file when you
--# received it.   If a file named ISC-LICENSE did not accompany this
-+# received it.  If a file named ISC-LICENSE did not accompany this
- # file, or you are not sure the one you have is correct, you may
- # obtain an applicable copy of the license at:
- #
--#             http://www.isc.org/isc-license-1.0.html. 
-+#            http://www.isc.org/isc-license-1.0.html. 
- #
--# This file is part of the ISC DHCP distribution.   The documentation
-+# This file is part of the ISC DHCP distribution.  The documentation
- # associated with this file is listed in the file DOCUMENTATION,
- # included in the top-level directory of this release.
- #
-@@ -17,47 +17,200 @@
- # http://www.isc.org for more information.
- #
- 
--SUBDIRS=	common $(MINIRES) dst omapip server client relay dhcpctl
-+COMMON_SUBDIRS=	common
-+DEVEL_SUBDIRS=	$(MINIRES) dst omapip dhcpctl
-+SERVER_SUBDIRS=	omshell server
-+RELAY_SUBDIRS=	relay
-+CLIENT_SUBDIRS=	client
-+
-+DEVEL_BUILD_SUBDIRS=	${COMMON_SUBDIRS} ${DEVEL_SUBDIRS}
-+SERVER_BUILD_SUBDIRS=	${SERVER_SUBDIRS}
-+RELAY_BUILD_SUBDIRS=	${RELAY_SUBDIRS}
-+CLIENT_BUILD_SUBDIRS=	${CLIENT_SUBDIRS}
-+
-+DEVEL_INSTALL_SUBDIRS=	${COMMON_SUBDIRS} ${DEVEL_SUBDIRS}
-+SERVER_INSTALL_SUBDIRS=	${COMMON_SUBDIRS} ${SERVER_SUBDIRS}
-+RELAY_INSTALL_SUBDIRS=	${RELAY_SUBDIRS}
-+CLIENT_INSTALL_SUBDIRS=	${COMMON_SUBDIRS} ${CLIENT_SUBDIRS}
- 
--all:
--	@for dir in ${SUBDIRS}; do \
-+all: all.server all.relay all.client
-+
-+all.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Making all in $$dir"; \
-+		(cd $$dir; $(MAKE) all) || exit 1; \
-+	done
-+
-+all.server: all.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Making all in $$dir"; \
-+		(cd $$dir; $(MAKE) all) || exit 1; \
-+	done
-+
-+all.relay: all.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Making all in $$dir"; \
-+		(cd $$dir; $(MAKE) all) || exit 1; \
-+	done
-+
-+all.client: all.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
- 		echo "Making all in $$dir"; \
- 		(cd $$dir; $(MAKE) all) || exit 1; \
--	 done
-+	done
-+
-+install: install.devel install.server install.relay install.client
-+
-+install.devel:
-+	@for dir in ${DEVEL_INSTALL_SUBDIRS}; do \
-+		echo "Installing in $$dir"; \
-+		(cd $$dir; $(MAKE) install) || exit 1; \
-+	done
- 
--install:
--	@for dir in ${SUBDIRS}; do \
-+install.server:
-+	@for dir in ${SERVER_INSTALL_SUBDIRS}; do \
- 		echo "Installing in $$dir"; \
- 		(cd $$dir; $(MAKE) install) || exit 1; \
--	 done
-+	done
- 
--depend:
--	@for dir in ${SUBDIRS}; do \
-+install.relay:
-+	@for dir in ${RELAY_INSTALL_SUBDIRS}; do \
-+		echo "Installing in $$dir"; \
-+		(cd $$dir; $(MAKE) install) || exit 1; \
-+	done
-+
-+install.client:
-+	@for dir in ${CLIENT_INSTALL_SUBDIRS}; do \
-+		echo "Installing in $$dir"; \
-+		(cd $$dir; $(MAKE) install) || exit 1; \
-+	done
-+
-+depend: depend.server depend.relay depend.client
-+
-+depend.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Making dependencies in $$dir"; \
-+		(cd $$dir; $(MAKE) depend) || exit 1; \
-+	done
-+
-+depend.server: depend.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Making dependencies in $$dir"; \
-+		(cd $$dir; $(MAKE) depend) || exit 1; \
-+	done
-+
-+depend.relay: depend.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
- 		echo "Making dependencies in $$dir"; \
- 		(cd $$dir; $(MAKE) depend) || exit 1; \
--	 done
-+	done
-+
-+depend.client: depend.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
-+		echo "Making dependencies in $$dir"; \
-+		(cd $$dir; $(MAKE) depend) || exit 1; \
-+	done
-+
-+clean: clean.server clean.relay clean.client
-+
-+clean.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) clean) || exit 1; \
-+	done
-+
-+clean.server: clean.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) clean) || exit 1; \
-+	done
-+
-+clean.relay: clean.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) clean) || exit 1; \
-+	done
- 
--clean:
--	@for dir in ${SUBDIRS}; do \
-+clean.client: clean.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
- 		echo "Cleaning in $$dir"; \
- 		(cd $$dir; $(MAKE) clean) || exit 1; \
--	 done
-+	done
-+
-+realclean: realclean.server realclean.relay realclean.client
-+
-+realclean.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) realclean) || exit 1; \
-+	done
- 
--realclean:
--	@for dir in ${SUBDIRS}; do \
-+realclean.server: realclean.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
- 		echo "Really cleaning in $$dir"; \
- 		(cd $$dir; $(MAKE) realclean) || exit 1; \
--	 done
-+	done
- 
--distclean:
--	@for dir in ${SUBDIRS}; do \
-+realclean.relay: realclean.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) realclean) || exit 1; \
-+	done
-+
-+realclean.client: realclean.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
-+		echo "Really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) realclean) || exit 1; \
-+	done
-+
-+distclean: distclean.server distclean.relay distclean.client
-+
-+distclean.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
- 		echo "Really, really cleaning in $$dir"; \
- 		(cd $$dir; $(MAKE) distclean) || exit 1; \
--	 done
--	@rm -f Makefile
-+	done
-+
-+distclean.server: distclean.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Really, really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) distclean) || exit 1; \
-+	done
-+
-+distclean.relay: distclean.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Really, really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) distclean) || exit 1; \
-+	done
-+
-+distclean.client: distclean.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
-+		echo "Really, really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) distclean) || exit 1; \
-+	done
-+
-+links: links.server links.relay links.client
-+
-+links.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Making links in $$dir"; \
-+		(cd $$dir; $(MAKE) links) || exit 1; \
-+	done
-+
-+links.server: links.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Making links in $$dir"; \
-+		(cd $$dir; $(MAKE) links) || exit 1; \
-+	done
-+
-+links.relay: links.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Making links in $$dir"; \
-+		(cd $$dir; $(MAKE) links) || exit 1; \
-+	done
- 
--links:
--	@for dir in ${SUBDIRS}; do \
-+links.client: links.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
- 		echo "Making links in $$dir"; \
- 		(cd $$dir; $(MAKE) links) || exit 1; \
--	 done
-+	done
diff --git a/net/isc-dhcp31-server/files/patch-client::clparse.c b/net/isc-dhcp31-server/files/patch-client::clparse.c
deleted file mode 100644
index 4140cc6e3109..000000000000
--- a/net/isc-dhcp31-server/files/patch-client::clparse.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/clparse.c.orig	Mon Feb 10 01:39:57 2003
-+++ client/clparse.c	Wed Mar  3 01:35:39 2004
-@@ -785,7 +785,7 @@
- 		if (status != ISC_R_SUCCESS)
- 			log_fatal ("Can't record interface %s: %s",
- 				   name, isc_result_totext (status));
--		strcpy (ip -> name, name);
-+		strlcpy (ip -> name, name, IFNAMSIZ);
- 		if (dummy_interfaces) {
- 			interface_reference (&ip -> next,
- 					     dummy_interfaces, MDL);
diff --git a/net/isc-dhcp31-server/files/patch-client::dhclient.8 b/net/isc-dhcp31-server/files/patch-client::dhclient.8
deleted file mode 100644
index a602907c31b6..000000000000
--- a/net/isc-dhcp31-server/files/patch-client::dhclient.8
+++ /dev/null
@@ -1,83 +0,0 @@
---- client/dhclient.8.orig	Sun Nov 17 03:25:43 2002
-+++ client/dhclient.8	Wed Mar  3 02:06:52 2004
-@@ -18,6 +18,10 @@
- .\"
- .\" $Id: dhclient.8,v 1.12.2.7 2002/11/17 02:25:43 dhankins Exp $
- .\"
-+.\" Portions copyright (c) 2000 David E. O'Brien.
-+.\" All rights reserved.
-+.\" $FreeBSD$
-+.\"
- .TH dhclient 8
- .SH NAME
- dhclient - Dynamic Host Configuration Protocol Client
-@@ -28,12 +32,18 @@
- .I port
- ]
- [
-+.B -D
-+]
-+[
- .B -d
- ]
- [
- .B -q
- ]
- [
-+.B -v
-+]
-+[
- .B -1
- ]
- [
-@@ -64,6 +74,10 @@
- relay
- ]
- [
-+.B -i
-+interval
-+]
-+[
- .B -n
- ]
- [
-@@ -148,6 +162,15 @@
- configuration file or on the command line, and will ignore all other
- interfaces.
- .PP
-+The
-+.B -D
-+flag causes
-+.B dhclient
-+to save the script it creates for use in conjunction with
-+.B dhclient-script
-+in
-+.IR /tmp.
-+.PP
- If the DHCP client should listen and transmit on a port other than the
- standard (port 68), the
- .B -p
-@@ -171,6 +194,12 @@
- flag, followed by the IP address to send.   This is only useful for testing,
- and should not be expected to work in any consistent or useful way.
- .PP
-+On FreeBSD, dhclient can be enabled to automatically handle the
-+link status of the network card. Normally polling is done every
-+five seconds. The polling interval can be set using the
-+.B -i
-+flag, followed by the numbers of seconds. Minimum is one second.
-+.PP
- The DHCP client will normally run in the foreground until it has
- configured an interface, and then will revert to running in the
- background.   To run force dhclient to always run as a foreground
-@@ -188,6 +217,10 @@
- .B -q
- flag prevents any messages other than errors from being printed to the
- standard error descriptor.
-+.B -v
-+flag turns on all messages.
-+Opposite of
-+.B -q .
- .PP
- The client normally doesn't release the current lease as it is not
- required by the DHCP protocol.  Some cable ISPs require their clients
diff --git a/net/isc-dhcp31-server/files/patch-client::dhclient.c b/net/isc-dhcp31-server/files/patch-client::dhclient.c
deleted file mode 100644
index 27cef99162df..000000000000
--- a/net/isc-dhcp31-server/files/patch-client::dhclient.c
+++ /dev/null
@@ -1,545 +0,0 @@
---- client/dhclient.c.orig	Sat Apr 26 23:51:39 2003
-+++ client/dhclient.c	Wed Mar  3 16:21:02 2004
-@@ -47,6 +47,13 @@
- #include "dhcpd.h"
- #include "version.h"
- 
-+#if __FreeBSD_version > 502010
-+#include <sys/ioctl.h>
-+#include <net/if_media.h>
-+#include <net80211/ieee80211_ioctl.h>
-+#include <net80211/ieee80211.h>
-+#endif
-+
- TIME cur_time;
- TIME default_lease_time = 43200; /* 12 hours... */
- TIME max_lease_time = 86400; /* 24 hours... */
-@@ -82,8 +89,11 @@
- struct string_list *client_env=NULL;
- int client_env_count=0;
- int onetry=0;
--int quiet=0;
-+int quiet=1;
- int nowait=0;
-+#ifdef ENABLE_POLLING_MODE
-+int polling_interval = 5;
-+#endif
- 
- static void usage PROTO ((void));
- 
-@@ -184,6 +194,9 @@
- 		} else if (!strcmp (argv [i], "-q")) {
- 			quiet = 1;
- 			quiet_interface_discovery = 1;
-+		} else if (!strcmp (argv [i], "-v")) {
-+			quiet = 0;
-+			quiet_interface_discovery = 0;
- 		} else if (!strcmp (argv [i], "-s")) {
- 			if (++i == argc)
- 				usage ();
-@@ -197,6 +210,19 @@
- 		} else if (!strcmp (argv [i], "-n")) {
- 			/* do not start up any interfaces */
- 			interfaces_requested = 1;
-+#ifdef ENABLE_POLLING_MODE
-+		} else if (!strcmp (argv [i], "-i")) {
-+			if (++i == argc)
-+				usage ();
-+			polling_interval = (int)strtol (argv [i],
-+			    (char **)NULL, 10);
-+			if (polling_interval <= 0) {
-+				log_info ("Incorrect polling interval %d",
-+				    polling_interval);
-+				log_info ("Using a default of 5 seconds");
-+				polling_interval = 5;
-+			}
-+#endif
- 		} else if (!strcmp (argv [i], "-w")) {
- 			/* do not exit if there are no broadcast interfaces. */
- 			persist = 1;
-@@ -225,7 +251,16 @@
- 		    if (strlen (argv [i]) > sizeof tmp -> name)
- 			    log_fatal ("%s: interface name too long (max %ld)",
- 				       argv [i], (long)strlen (argv [i]));
-- 		    strcpy (tmp -> name, argv [i]);
-+ 		    strlcpy (tmp -> name, argv [i], IFNAMSIZ);
-+#if __FreeBSD_version > 502010
-+		    set_ieee80211 (tmp);
-+#endif
-+		    /* Init some interface vars, enable polling */
-+#ifdef ENABLE_POLLING_MODE
-+		    tmp -> forcediscover = 0;
-+		    tmp -> linkstate = HAVELINK;
-+		    tmp -> polling = 1;
-+#endif /* ifdef ENABLE_POLLING_MODE */
- 		    if (interfaces) {
- 			    interface_reference (&tmp -> next,
- 						 interfaces, MDL);
-@@ -385,6 +420,16 @@
- 					     INTERFACE_AUTOMATIC)) !=
- 			     INTERFACE_REQUESTED))
- 				continue;
-+#if __FreeBSD_version > 502010
-+			set_ieee80211 (ip);
-+#endif
-+#ifdef ENABLE_POLLING_MODE
-+			ip -> forcediscover = 0;
-+			if (ip -> client -> config -> media != NULL)
-+				ip -> havemedia = 1;
-+			else
-+				ip -> havemedia = 0;
-+#endif
- 			script_init (ip -> client,
- 				     "PREINIT", (struct string_list *)0);
- 			if (ip -> client -> alias)
-@@ -427,8 +472,13 @@
- 				client -> state = S_INIT;
- 				/* Set up a timeout to start the initialization
- 				   process. */
-+#ifdef ENABLE_POLLING_MODE
-+				add_timeout (cur_time + random () % 5 + 2,
-+					     state_polling, client, 0, 0);
-+#else
- 				add_timeout (cur_time + random () % 5,
- 					     state_reboot, client, 0, 0);
-+#endif
- 			}
- 		}
- 	}
-@@ -486,9 +536,9 @@
- 	log_info (arr);
- 	log_info (url);
- 
--	log_error ("Usage: dhclient [-1dqr] [-nw] [-p <port>] %s",
--		   "[-s server]");
--	log_error ("                [-cf config-file] [-lf lease-file]%s",
-+	log_error ("Usage: dhclient [-1Ddqrv] [-i polling-interval] %s",
-+		   "[-nw] [-p <port>] [-s server]");
-+	log_error ("                [-cf config-file] [-lf lease-file] %s",
- 		   "[-pf pid-file] [-e VAR=val]");
- 	log_fatal ("                [-sf script-file] [interface]");
- }
-@@ -876,6 +926,15 @@
- 	/* Write out the new lease. */
- 	write_client_lease (client, client -> new, 0, 0);
- 
-+	/*
-+	 * It's now possible that state_reboot can be called
-+	 * after a interface link went down and is up again.
-+	 * To prevent tons of equal leases saved on disk, we rewrite
-+	 * them.
-+	 */
-+	read_client_leases ();
-+	rewrite_client_leases ();
-+ 
- 	/* Replace the old active lease with the new one. */
- 	if (client -> active)
- 		destroy_client_lease (client -> active);
-@@ -890,6 +949,12 @@
- 	      piaddr (client -> active -> address),
- 	      (long)(client -> active -> renewal - cur_time));
- 	client -> state = S_BOUND;
-+#ifdef ENABLE_POLLING_MODE
-+	/* Init some interface vars, enable polling */
-+	client -> interface -> linkstate = HAVELINK;
-+	client -> interface -> forcediscover = 0;
-+	client -> interface -> polling = 1;
-+#endif /* ifdef ENABLE_POLLING_MODE */
- 	reinitialize_interfaces ();
- 	go_daemon ();
- 	if (client -> config -> do_forward_update) {
-@@ -1352,6 +1417,11 @@
- 	int interval;
- 	int increase = 1;
- 
-+#ifdef ENABLE_POLLING_MODE
-+	/* Disable polling for this interface */
-+	client -> interface -> polling = 0;
-+#endif
-+
- 	/* Figure out how long it's been since we started transmitting. */
- 	interval = cur_time - client -> first_sending;
- 
-@@ -1457,6 +1527,9 @@
- 	struct client_lease *loop;
- 	struct client_lease *lp;
- 
-+	if (client -> interface -> linkstate == NOLINK)
-+		return;
-+
- 	loop = lp = client -> active;
- 
- 	log_info ("No DHCPOFFERS received.");
-@@ -1489,6 +1562,10 @@
- 				log_info ("bound: renewal in %ld %s.",
- 					  (long)(client -> active -> renewal -
- 						 cur_time), "seconds");
-+#ifdef ENABLE_POLLING_MODE
-+				/* Enable polling for this interface */
-+				client -> interface -> polling = 1;
-+#endif
- 				add_timeout (client -> active -> renewal,
- 					     state_bound, client, 0, 0);
- 			    } else {
-@@ -1496,6 +1573,11 @@
- 				log_info ("bound: immediate renewal.");
- 				state_bound (client);
- 			    }
-+			    /*
-+			     * Set the link status back to nolink, even
-+			     * if we have media settings.
-+			     */
-+                            client -> interface -> linkstate = NOLINK;
- 			    reinitialize_interfaces ();
- 			    go_daemon ();
- 			    return;
-@@ -1541,6 +1623,12 @@
- 	}
- 
- 	log_info ("No working leases in persistent database - sleeping.");
-+
-+#ifdef ENABLE_POLLING_MODE
-+	/* Enable polling for this interface */
-+	client -> interface -> polling = 1;
-+#endif
-+
- 	script_init (client, "FAIL", (struct string_list *)0);
- 	if (client -> alias)
- 		script_write_params (client, "alias_", client -> alias);
-@@ -1681,6 +1769,18 @@
- 			client -> packet.secs = htons (65535);
- 	}
- 
-+	/*
-+	 * Only try the first ten seconds to renew a lease from a
-+	 * given dhcp-server adress. After that, fall back to use
-+	 * state_reboot with INADDR_BROADCAST.
-+	 */
-+	if (destination.sin_addr.s_addr != INADDR_BROADCAST &&
-+	   (client -> state == S_RENEWING || client -> state == S_REBINDING)) {
-+		if (client -> active && client -> active -> expiry > cur_time &&
-+			interval >= 10)
-+			goto cancel;
-+	}
-+
- 	log_info ("DHCPREQUEST on %s to %s port %d",
- 	      client -> name ? client -> name : client -> interface -> name,
- 	      inet_ntoa (destination.sin_addr),
-@@ -1702,6 +1802,16 @@
- 				      from, &destination,
- 				      (struct hardware *)0);
- 
-+	/*
-+	 * If sendto() for a direct request fails, fall back to use
-+	 * state_reboot with INADDR_BROADCAST.
-+	 */
-+	if (result == -1 && destination.sin_addr.s_addr != INADDR_BROADCAST &&
-+	   (client -> state == S_RENEWING || client -> state == S_REBINDING)) {
-+		if (client -> active && client -> active -> expiry > cur_time)
-+			goto cancel;
-+	}
-+
- 	add_timeout (cur_time + client -> interval,
- 		     send_request, client, 0, 0);
- }
-@@ -2597,6 +2707,13 @@
- 			wstatus = 0;
- 		}
- 	} else {
-+		if ((i = open(_PATH_DEVNULL, O_RDWR)) != -1) {
-+			dup2(i, STDIN_FILENO);
-+			dup2(i, STDOUT_FILENO);
-+			dup2(i, STDERR_FILENO);
-+			if (i > STDERR_FILENO)
-+				close(i);
-+		}
- 		execve (scriptName, argv, envp);
- 		log_error ("execve (%s, ...): %m", scriptName);
- 		exit (0);
-@@ -2783,8 +2900,10 @@
- 			      case S_STOPPED:
- 				break;
- 			}
-+#ifndef ENABLE_POLLING_MODE
- 			client -> state = S_INIT;
- 			state_reboot (client);
-+#endif
- 		}
- 	}
- }
-@@ -3010,7 +3129,9 @@
- 		    break;
- 
- 		  case server_awaken:
-+#ifndef ENABLE_POLLING_MODE
- 		    state_reboot (client);
-+#endif
- 		    break;
- 		}
- 	    }
-@@ -3147,3 +3268,265 @@
- 	data_string_forget (&ddns_dhcid, MDL);
- 	return rcode;
- }
-+ 
-+/* Check to see if there's a wire plugged in */
-+int
-+interface_active(struct interface_info *ip) {
-+#if __FreeBSD_version > 502010
-+	struct ifmediareq ifmr;
-+	int *media_list, i;
-+	char *ifname;
-+	int sock;
-+ 
-+	ifname = ip -> name;
-+ 
-+	if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
-+		log_fatal ("Can't create interface_active socket");
-+ 
-+	(void) memset (&ifmr, 0, sizeof (ifmr));
-+	(void) strncpy (ifmr.ifm_name, ifname, sizeof (ifmr.ifm_name));
-+ 
-+	if (ioctl (sock, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
-+		/*
-+		 * Interface doesn't support SIOCGIFMEDIA, presume okay
-+		 */
-+		close (sock);
-+		return (HAVELINK);
-+	}
-+	close (sock);
-+ 
-+	if (ifmr.ifm_count == 0) {
-+		/*
-+		 * Assume that this means interface
-+		 * does not support SIOCGIFMEDIA
-+		 */
-+		log_fatal ("%s: no media types?", ifname);
-+		return (HAVELINK);
-+	}
-+ 
-+	if (ifmr.ifm_status & IFM_AVALID) {
-+		if (ip -> ieee80211) {
-+			/*
-+			 * Wavelan devices need to be checked if they are
-+			 * associated.
-+			 */
-+			if ((IFM_TYPE(ifmr.ifm_active) == IFM_IEEE80211) &&
-+			     (ifmr.ifm_status & IFM_ACTIVE)) {
-+				return (HAVELINK);
-+			}
-+		} else {
-+			if (ifmr.ifm_status & IFM_ACTIVE) {
-+				return (HAVELINK);
-+			}
-+		}
-+		/*
-+		 * We really have no link.
-+		 */
-+		return (NOLINK);
-+	}
-+	/*
-+	 * IFM_AVALID is not set. We cannot check
-+	 * the link state. Assume HAVELINK.
-+	 */
-+ 
-+#endif /* Other OSs */
-+	/*
-+	 * Always return a successful link if the OS
-+	 * is not supported.
-+	 */
-+	return (HAVELINK);
-+}
-+ 
-+#if __FreeBSD_version > 502010
-+void
-+set_ieee80211 (struct interface_info *ip) {
-+ 
-+	struct ieee80211req     ireq;
-+	u_int8_t                data[32];
-+	int                     associated = 0;
-+	int *media_list, i;
-+	char *ifname;
-+	int sock;
-+ 
-+	ifname = ip -> name;
-+ 
-+	if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
-+		log_fatal ("Can't create interface_active socket");
-+ 
-+	(void) memset (&ireq, 0, sizeof (ireq));
-+	(void) strncpy (ireq.i_name, ifname, sizeof (ireq.i_name));
-+	ireq.i_data = &data;
-+	ireq.i_type = IEEE80211_IOC_SSID;
-+	ireq.i_val = -1;
-+	/*
-+	 * If we can't get the SSID,
-+	 * this isn't an 802.11 device.
-+	 */
-+	if (ioctl (sock, SIOCG80211, &ireq) < 0)
-+		ip -> ieee80211 = 0;
-+	else {
-+#ifdef DEBUG
-+		printf ("Device %s has 802.11\n", ifname);
-+#endif
-+		ip -> ieee80211 = 1;
-+	}
-+	close (sock);
-+ }
-+#endif /* __FreeBSD_version */
-+ 
-+#ifdef ENABLE_POLLING_MODE
-+/* Go to background after some time */
-+void state_background (cpp)
-+	void *cpp;
-+{
-+	go_daemon ();
-+}
-+
-+/* Check the state of the NICs if we have link */
-+void state_polling (cpp)
-+	 void *cpp;
-+{
-+	static int doinitcheck = 0;
-+	struct interface_info *ip;
-+	struct client_state *client;
-+	int result;
-+ 
-+	for (ip = interfaces; ip; ip = ip -> next) {
-+		if (! ip -> polling)
-+			continue;
-+#ifdef DEBUG
-+		printf ("%s: Polling interface state\n", ip -> name);
-+		for (client = ip -> client;
-+		     client; client = client -> next) {
-+			printf ("%s: client state of %d\n", ip -> name, ip -> client -> state);
-+			printf ("%s: link = %d\n", ip -> name, ip -> linkstate);
-+		}
-+#endif
-+ 
-+		result = interface_active (ip);
-+		/*
-+		 * If dhclient.conf contains media settings, we cannot
-+		 * abort if the interface is not set to active mode.
-+		 */
-+		if (ip -> havemedia && ip -> client -> state != S_BOUND) {
-+			if (result == HAVELINK)
-+				ip -> forcediscover = 1;
-+			result = HAVELINK;
-+		}
-+ 
-+		/*
-+		 * The last status of the interface tells us
-+		 * the we've got no link ...
-+		 */
-+		if (ip -> linkstate == NOLINK || ! doinitcheck) {
-+			/*
-+			 * ... but we have now link. Let's send
-+			 * requests.
-+			 */
-+			if (result == HAVELINK) {
-+#ifdef DEBUG
-+				if (ip -> havemedia)
-+					printf ("%s: Trying media settings on interface\n",
-+						ip -> name);
-+				else
-+					printf ("%s: Found Link on interface\n", ip -> name);
-+#endif
-+				/*
-+				 * Set the interface to state_bound. We assume that we have
-+				 * a working link. If we cannot reach the server directly,
-+				 * INADDR_BROADCAST is used.
-+				 */
-+				for (client = ip -> client;
-+				     client; client = client -> next) {
-+					cancel_timeout (state_init, client);
-+					cancel_timeout (state_reboot, client);
-+					cancel_timeout (state_selecting, client);
-+					if (client -> active) {
-+						add_timeout (cur_time + random () % 5,
-+						   state_bound, client, 0, 0);
-+					} else {
-+						add_timeout (cur_time + random () % 5,
-+						   state_reboot, client, 0, 0);
-+					}
-+				}
-+				ip -> linkstate = HAVELINK;
-+			} else {
-+#ifdef DEBUG
-+				printf ("%s: No link on interface\n", ip -> name);
-+#endif
-+				for (client = ip -> client;
-+				     client; client = client -> next) {
-+					/*
-+					 * Without this add_timout(), dhclient does
-+					 * not poll on a interface if there
-+					 * is no cable plugged in at startup
-+					 * time. Because we add one additional second
-+					 * to the time of a normal timeout, we always
-+					 * skip and block a running one. This prevents
-+					 * that polling is done twice at the same time.
-+					 */
-+					if (client -> state == S_INIT) {
-+						add_timeout (cur_time + (polling_interval + 1),
-+							     state_polling, client, 0, 0);
-+					}
-+				}
-+				ip -> linkstate = NOLINK;
-+				/*
-+				 * Automatically go into the background after
-+				 * some time. Do this only if there are no
-+				 * media options available for a interface.
-+				 */
-+				if (! ip -> havemedia && ! doinitcheck) {
-+					add_timeout (cur_time + (polling_interval * 2),
-+						    state_background, client, 0, 0);
-+				}
-+			}
-+		}
-+ 
-+		/*
-+		 * The last status of the interface tells us
-+		 * the we previously had link.
-+		 */
-+		if (ip -> linkstate == HAVELINK && doinitcheck) {
-+			if (result == NOLINK) {
-+				/*
-+				 * We lost link on the interface, or it isn't
-+				 * associated anymore.
-+				 */
-+#ifdef DEBUG
-+				printf ("%s: Lost Link on interface\n", ip -> name);
-+#endif
-+				/*
-+				 * After we lost link, cycle again through the
-+				 * different media settings if available. Else
-+				 * set NOLINK.
-+				 */
-+				if (ip -> havemedia)
-+					ip -> forcediscover = 1;
-+				else
-+					ip -> linkstate = NOLINK;
-+			}
-+			/*
-+			 * If we happen to have a real link, but no
-+			 * active lease, force the interface into
-+			 * state_reboot. Do the same if media settings
-+			 * are available.
-+			 */
-+			if (ip -> forcediscover) {
-+				for (client = ip -> client;
-+				     client; client = client -> next) {
-+					if (client -> state != S_REBOOTING &&
-+					    client -> state != S_SELECTING) {
-+						add_timeout (cur_time + random () % 5,
-+							    state_reboot, client, 0, 0);
-+					}
-+				}
-+				ip -> forcediscover = 0;
-+				ip -> linkstate = HAVELINK;
-+			}
-+			/* We still have link, do nothing. */
-+		}
-+	}
-+	doinitcheck = 1;
-+}
-+#endif /* ifdef ENABLE_POLLING_MODE */
diff --git a/net/isc-dhcp31-server/files/patch-client::dhclient.conf b/net/isc-dhcp31-server/files/patch-client::dhclient.conf
deleted file mode 100644
index 2d9560f43bf8..000000000000
--- a/net/isc-dhcp31-server/files/patch-client::dhclient.conf
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/dhclient.conf.orig	Tue Jun  3 00:50:44 1997
-+++ client/dhclient.conf	Wed Mar  3 02:20:41 2004
-@@ -11,7 +11,7 @@
- reboot 10;
- select-timeout 5;
- initial-interval 2;
--script "/etc/dhclient-script";
-+script "%%PREFIX%%/sbin/dhclient-script";
- media "-link0 -link1 -link2", "link0 link1";
- reject 192.33.137.209;
- 
diff --git a/net/isc-dhcp31-server/files/patch-common::dhcp-options.5 b/net/isc-dhcp31-server/files/patch-common::dhcp-options.5
deleted file mode 100644
index 9d936cfffeee..000000000000
--- a/net/isc-dhcp31-server/files/patch-common::dhcp-options.5
+++ /dev/null
@@ -1,32 +0,0 @@
---- common/dhcp-options.5.orig	Sun Feb 23 04:27:42 2003
-+++ common/dhcp-options.5	Wed Mar  3 02:12:13 2004
-@@ -431,7 +431,10 @@
- the domain-name option to specify the domain name).  See RFC 1035 for
- character set restrictions.  This option is only honored by
- .B dhclient-script(8)
--if the hostname for the client machine is not set.
-+if the hostname for the client machine is not set (i.e., set to the empty
-+string in
-+.B rc.conf(5)
-+).
- .RE
- .PP
- .B option \fBieee802-3-encapsulation\fR \fIflag\fR\fB;\fR
-@@ -654,7 +657,7 @@
- This option specifies whether the client should configure its IP
- layer to allow forwarding of datagrams with non-local source routes
- (see Section 3.3.5 of [4] for a discussion of this topic).  A value
--of false means disallow forwarding of such datagrams, and a value of true
-+of 0 means disallow forwarding of such datagrams, and a value of true
- means allow forwarding.
- .RE
- .PP
-@@ -948,7 +951,7 @@
- .PP
- This option specifies whether or not the client should negotiate the
- use of trailers (RFC 893 [14]) when using the ARP protocol.  A value
--of false indicates that the client should not attempt to use trailers.  A
-+of 0 indicates that the client should not attempt to use trailers.  A
- value of true means that the client should attempt to use trailers.
- .RE
- .PP
diff --git a/net/isc-dhcp31-server/files/patch-common::discover.c b/net/isc-dhcp31-server/files/patch-common::discover.c
deleted file mode 100644
index 1cfcc2094098..000000000000
--- a/net/isc-dhcp31-server/files/patch-common::discover.c
+++ /dev/null
@@ -1,238 +0,0 @@
---- common/discover.c.orig	Fri Jul 25 21:44:15 2003
-+++ common/discover.c	Fri Mar  5 23:33:04 2004
-@@ -47,6 +47,7 @@
- #endif /* not lint */
- 
- #include "dhcpd.h"
-+#include <ifaddrs.h>
- #include <sys/ioctl.h>
- 
- struct interface_info *interfaces, *dummy_interfaces, *fallback_interface;
-@@ -135,10 +136,7 @@
- {
- 	struct interface_info *tmp, *ip;
- 	struct interface_info *last, *next;
--	char buf [2048];
--	struct ifconf ic;
--	struct ifreq ifr;
--	int i;
-+	struct ifaddrs *ifap, *ifa;
- 	int sock;
- 	int address_count = 0;
- 	struct subnet *subnet;
-@@ -157,61 +155,6 @@
- 	if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
- 		log_fatal ("Can't create addrlist socket");
- 
--	/* Get the interface configuration information... */
--
--#ifdef SIOCGIFCONF_ZERO_PROBE
--	/* linux will only tell us how long a buffer it wants if we give it
--	 * a null buffer first. So, do a dry run to figure out the length.
--	 * 
--	 * XXX this code is duplicated from below because trying to fold
--	 * the logic into the if statement and goto resulted in excesssive
--	 * obfuscation. The intent is that unless you run Linux you shouldn't
--	 * have to deal with this. */
--
--	ic.ifc_len = 0;
--	ic.ifc_ifcu.ifcu_buf = (caddr_t)NULL;
--#else
--	/* otherwise, we just feed it a starting size, and it'll tell us if
--	 * it needs more */
--
--	ic.ifc_len = sizeof buf;
--	ic.ifc_ifcu.ifcu_buf = (caddr_t)buf;
--#endif
--
--      gifconf_again:
--	i = ioctl(sock, SIOCGIFCONF, &ic);
--
--	if (i < 0)
--		log_fatal ("ioctl: SIOCGIFCONF: %m");
--
--#ifdef SIOCGIFCONF_ZERO_PROBE
--	/* Workaround for SIOCGIFCONF bug on some Linux versions. */
--	if (ic.ifc_ifcu.ifcu_buf == 0 && ic.ifc_len == 0) {
--		ic.ifc_len = sizeof buf;
--		ic.ifc_ifcu.ifcu_buf = (caddr_t)buf;
--		goto gifconf_again;
--	}
--#endif
--
--	/* If the SIOCGIFCONF resulted in more data than would fit in
--	   a buffer, allocate a bigger buffer. */
--	if ((ic.ifc_ifcu.ifcu_buf == buf 
--#ifdef SIOCGIFCONF_ZERO_PROBE
--	     || ic.ifc_ifcu.ifcu_buf == 0
--#endif
--		) && ic.ifc_len > sizeof buf) {
--		ic.ifc_ifcu.ifcu_buf = dmalloc ((size_t)ic.ifc_len, MDL);
--		if (!ic.ifc_ifcu.ifcu_buf)
--			log_fatal ("Can't allocate SIOCGIFCONF buffer.");
--		goto gifconf_again;
--#ifdef SIOCGIFCONF_ZERO_PROBE
--	} else if (ic.ifc_ifcu.ifcu_buf == 0) {
--		ic.ifc_ifcu.ifcu_buf = (caddr_t)buf;
--		ic.ifc_len = sizeof buf;
--		goto gifconf_again;
--#endif
--	}
--
- 		
- 	/* If we already have a list of interfaces, and we're running as
- 	   a DHCP server, the interfaces were requested. */
-@@ -224,51 +167,38 @@
- 	else
- 		ir = INTERFACE_REQUESTED;
- 
-+	if (getifaddrs(&ifap) != 0)
-+		log_fatal ("getifaddrs failed");
-+
- 	/* Cycle through the list of interfaces looking for IP addresses. */
--	for (i = 0; i < ic.ifc_len;) {
--		struct ifreq *ifp = (struct ifreq *)((caddr_t)ic.ifc_req + i);
--#ifdef HAVE_SA_LEN
--		if (ifp -> ifr_addr.sa_len > sizeof (struct sockaddr))
--			i += (sizeof ifp -> ifr_name) + ifp -> ifr_addr.sa_len;
--		else
--#endif
--			i += sizeof *ifp;
-+	for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
- 
- #ifdef ALIAS_NAMES_PERMUTED
--		if ((s = strrchr (ifp -> ifr_name, ':'))) {
-+		if ((s = strrchr (ifa -> ifa_name, ':'))) {
- 			*s = 0;
- 		}
- #endif
- 
- #ifdef SKIP_DUMMY_INTERFACES
--		if (!strncmp (ifp -> ifr_name, "dummy", 5))
-+		if (!strncmp (ifa -> ifa_name, "dummy", 5))
- 			continue;
- #endif
- 
--
--		/* See if this is the sort of interface we want to
--		   deal with. */
--		strcpy (ifr.ifr_name, ifp -> ifr_name);
--		if (ioctl (sock, SIOCGIFFLAGS, &ifr) < 0)
--			log_fatal ("Can't get interface flags for %s: %m",
--			       ifr.ifr_name);
--
- 		/* See if we've seen an interface that matches this one. */
- 		for (tmp = interfaces; tmp; tmp = tmp -> next)
--			if (!strcmp (tmp -> name, ifp -> ifr_name))
-+			if (!strcmp (tmp -> name, ifa -> ifa_name))
- 				break;
- 
--		/* Skip non broadcast interfaces (plus loopback and
--		   point-to-point in case an OS incorrectly marks them
--		   as broadcast). Also skip down interfaces unless we're
-+		/* See if this is the sort of interface we want to
-+		   deal with.  Skip loopback, point-to-point and down
-+		   interfaces, except don't skip down interfaces if we're
- 		   trying to get a list of configurable interfaces. */
--		if (((!(ifr.ifr_flags & IFF_BROADCAST) ||
--		      ifr.ifr_flags & IFF_LOOPBACK ||
--		      ifr.ifr_flags & IFF_POINTOPOINT) && !tmp) ||
--		    (!(ifr.ifr_flags & IFF_UP) &&
-+		if ((ifa->ifa_flags & IFF_LOOPBACK) ||
-+		     (ifa->ifa_flags & IFF_POINTOPOINT) ||
-+		     (!(ifa->ifa_flags & IFF_UP) &&
- 		     state != DISCOVER_UNCONFIGURED))
- 			continue;
--		
-+
- 		/* If there isn't already an interface by this name,
- 		   allocate one. */
- 		if (!tmp) {
-@@ -276,9 +206,9 @@
- 			status = interface_allocate (&tmp, MDL);
- 			if (status != ISC_R_SUCCESS)
- 				log_fatal ("Error allocating interface %s: %s",
--					   ifp -> ifr_name,
-+					   ifa -> ifa_name,
- 					   isc_result_totext (status));
--			strcpy (tmp -> name, ifp -> ifr_name);
-+			strcpy (tmp -> name, ifa -> ifa_name);
- 			interface_snorf (tmp, ir);
- 			interface_dereference (&tmp, MDL);
- 			tmp = interfaces; /* XXX */
-@@ -290,9 +220,9 @@
- 		/* If we have the capability, extract link information
- 		   and record it in a linked list. */
- #ifdef HAVE_AF_LINK
--		if (ifp -> ifr_addr.sa_family == AF_LINK) {
-+		if (ifa -> ifa_addr->sa_family == AF_LINK) {
- 			struct sockaddr_dl *foo = ((struct sockaddr_dl *)
--						   (&ifp -> ifr_addr));
-+						   (ifa -> ifa_addr));
- #if defined (HAVE_SIN_LEN)
- 			tmp -> hw_address.hlen = foo -> sdl_alen;
- #else
-@@ -305,12 +235,11 @@
- 		} else
- #endif /* AF_LINK */
- 
--		if (ifp -> ifr_addr.sa_family == AF_INET) {
-+		if (ifa -> ifa_addr->sa_family == AF_INET) {
- 			struct iaddr addr;
- 
- 			/* Get a pointer to the address... */
--			memcpy (&foo, &ifp -> ifr_addr,
--				sizeof ifp -> ifr_addr);
-+			bcopy(ifa->ifa_addr, &foo, sizeof(foo));
- 
- 			/* We don't want the loopback interface. */
- 			if (foo.sin_addr.s_addr == htonl (INADDR_LOOPBACK) &&
-@@ -323,16 +252,15 @@
- 			   found, keep a pointer to ifreq structure in
- 			   which we found it. */
- 			if (!tmp -> ifp) {
--#ifdef HAVE_SA_LEN
--				unsigned len = ((sizeof ifp -> ifr_name) +
--						ifp -> ifr_addr.sa_len);
--#else
--				unsigned len = sizeof *ifp;
--#endif
-+
-+				int len = (IFNAMSIZ +
-+					ifa -> ifa_addr->sa_len);
- 				tif = (struct ifreq *)dmalloc (len, MDL);
- 				if (!tif)
- 					log_fatal ("no space for ifp.");
--				memcpy (tif, ifp, len);
-+				strlcpy(tif->ifr_name, ifa->ifa_name, IFNAMSIZ);
-+				memcpy(&tif->ifr_addr, ifa->ifa_addr,
-+					ifa->ifa_addr->sa_len);
- 				tmp -> ifp = tif;
- 				tmp -> primary_address = foo.sin_addr;
- 			}
-@@ -346,9 +274,6 @@
- 		}
- 	}
- 
--	/* If we allocated a buffer, free it. */
--	if (ic.ifc_ifcu.ifcu_buf != buf)
--		dfree (ic.ifc_ifcu.ifcu_buf, MDL);
- 
- #if defined (LINUX_SLASHPROC_DISCOVERY)
- 	/* On Linux, interfaces that don't have IP addresses don't
-@@ -529,6 +454,7 @@
- 	   be able to configure, we can quit now. */
- 	if (state == DISCOVER_UNCONFIGURED) {
- 		close (sock);
-+		freeifaddrs(ifap);
- 		return;
- 	}
- 
-@@ -674,6 +600,7 @@
- 	}
- 
- 	close (sock);
-+	freeifaddrs(ifap);
- 
- 	if (state == DISCOVER_SERVER && wifcount == 0) {
- 		log_info ("%s", "");
diff --git a/net/isc-dhcp31-server/files/patch-common::dispatch.c b/net/isc-dhcp31-server/files/patch-common::dispatch.c
deleted file mode 100644
index 0aa709cf0860..000000000000
--- a/net/isc-dhcp31-server/files/patch-common::dispatch.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- common/dispatch.c.orig	Sun Nov 17 03:26:57 2002
-+++ common/dispatch.c	Wed Mar  3 16:20:15 2004
-@@ -95,11 +95,26 @@
- void dispatch ()
- {
- 	struct timeval tv, *tvp;
-+#ifdef ENABLE_POLLING_MODE
-+	struct timeval *tvp_new;
-+#endif
- 	isc_result_t status;
-+	TIME cur_time;
- 
-+	tvp = NULL;
-+#ifdef ENABLE_POLLING_MODE
-+	tvp_new = NULL;
-+#endif
- 	/* Wait for a packet or a timeout... XXX */
- 	do {
- 		tvp = process_outstanding_timeouts (&tv);
-+#ifdef ENABLE_POLLING_MODE
-+		GET_TIME (&cur_time);
-+		add_timeout(cur_time + polling_interval, state_polling, 0, 0, 0);
-+		tvp_new = process_outstanding_timeouts(&tv);
-+		if (tvp != NULL && (tvp -> tv_sec > tvp_new -> tv_sec))
-+			tvp = tvp_new;
-+#endif /* ENABLE_POLLING_MODE */
- 		status = omapi_one_dispatch (0, tvp);
- 	} while (status == ISC_R_TIMEDOUT || status == ISC_R_SUCCESS);
- 	log_fatal ("omapi_one_dispatch failed: %s -- exiting.",
diff --git a/net/isc-dhcp31-server/files/patch-common::parse.c b/net/isc-dhcp31-server/files/patch-common::parse.c
deleted file mode 100644
index 637d69e7f41b..000000000000
--- a/net/isc-dhcp31-server/files/patch-common::parse.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- common/parse.c.orig	2 Sep 2003 11:01:23 -0000
-+++ common/parse.c	22 Feb 2004 10:44:52 -0000
-@@ -414,6 +414,7 @@
- {
- 	const char *val;
- 	enum dhcp_token token;
-+	int32_t num;
- 
- 	token = next_token (&val, (unsigned *)0, cfile);
- 	if (token != NUMBER) {
-@@ -421,9 +422,9 @@
- 		skip_to_semi (cfile);
- 		return;
- 	}
--	convert_num (cfile, (unsigned char *)timep, val, 10, 32);
-+	convert_num (cfile, (unsigned char *)&num, val, 10, 32);
- 	/* Unswap the number - convert_num returns stuff in NBO. */
--	*timep = ntohl (*timep); /* XXX */
-+	*timep = ntohl (num);
- 
- 	parse_semi (cfile);
- }
diff --git a/net/isc-dhcp31-server/files/patch-configure b/net/isc-dhcp31-server/files/patch-configure
deleted file mode 100644
index 5aff6909acce..000000000000
--- a/net/isc-dhcp31-server/files/patch-configure
+++ /dev/null
@@ -1,41 +0,0 @@
---- configure.orig	Sat Apr 20 23:44:13 2002
-+++ configure	Mon Apr 28 23:02:10 2003
-@@ -13,6 +13,9 @@
-   elif [ x$1 = x--dirs ]; then
-     dirs=$2
-     shift
-+  elif [ x$1 = x--subsys ]; then
-+    subsys=$2
-+    shift
-   elif [ x$1 = x--no-links ]; then
-     nolinks=YES
-   elif [ x$1 = x--copts ]; then
-@@ -233,7 +236,14 @@
- fi
- 
- if [ x"$dirs" = x ]; then
--  dirs=". client server relay common omapip dhcpctl minires dst"
-+  dirs=". common minires dst omapip dhcpctl"
-+  if [ x$subsys = x ]; then
-+    dirs="$dirs server omshell client relay"
-+  elif [ x$subsys = xserver ]; then
-+    dirs="$dirs server omshell"
-+  elif [ x$subsys = xclient -o x$subsys = xrelay ]; then
-+    dirs="$dirs $subsys"
-+  fi
- fi
- 
- for foo in $dirs; do
-@@ -253,7 +263,11 @@
- 
- # Make the link tree in which to actually build.
- if [ x$nolinks = x ]; then
--  make links
-+  if [ x$subsys = x ]; then
-+    make links
-+  else
-+    make links.$subsys
-+  fi
- fi
- 
- exit 0
diff --git a/net/isc-dhcp31-server/files/patch-dhcpctl::Makefile.dist b/net/isc-dhcp31-server/files/patch-dhcpctl::Makefile.dist
deleted file mode 100644
index acfee5854413..000000000000
--- a/net/isc-dhcp31-server/files/patch-dhcpctl::Makefile.dist
+++ /dev/null
@@ -1,79 +0,0 @@
---- dhcpctl/Makefile.dist.orig	Mon Apr 28 16:31:57 2003
-+++ dhcpctl/Makefile.dist	Mon Apr 28 16:24:20 2003
-@@ -17,11 +17,11 @@
- # http://www.isc.org for more information.
- #
- 
--CATMANPAGES = dhcpctl.cat3 omshell.cat1
--SEDMANPAGES = dhcpctl.man3 omshell.man1
-+CATMANPAGES = dhcpctl.cat3
-+SEDMANPAGES = dhcpctl.man3
- SRC    = dhcpctl.c callback.c remote.c
- OBJ    = dhcpctl.o callback.o remote.o
--MAN    = dhcpctl.3 omshell.1
-+MAN    = dhcpctl.3
- HDRS   = dhcpctl.h
- 
- INCLUDES = $(BINDINC) -I$(TOP)/includes
-@@ -29,10 +29,7 @@
- DHCPCTLLIBS = libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \
- 		../omapip/libomapi.a ../dst/libdst.a
- 
--all:	libdhcpctl.a omshell cltest $(CATMANPAGES)
--
--omshell:	omshell.o $(DHCPCTLLIBS)
--	$(CC) $(DEBUG) $(LFLAGS) -o omshell omshell.o $(DHCPCTLLIBS) $(LIBS)
-+all:	libdhcpctl.a cltest $(CATMANPAGES)
- 
- cltest:	cltest.o $(DHCPCTLLIBS)
- 	$(CC) $(DEBUG) $(LFLAGS) -o cltest cltest.o $(DHCPCTLLIBS) $(LIBS)
-@@ -43,8 +40,7 @@
- 	$(RANLIB) libdhcpctl.a
- 
- install: all $(CATMANPAGES)
--	for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR) $(USRMANDIR) \
--		$(USERBINDIR); do \
-+	for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR); do \
- 	  foo=""; \
- 	  for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
- 	    foo=$${foo}/$$bar; \
-@@ -64,16 +60,12 @@
- 	  $(MANINSTALL) $(MANFROM) $${prefix}.$(MANCAT)$${suffix} $(MANTO) \
- 			$(DESTDIR)$(LIBMANDIR)/$${prefix}$(LIBMANEXT); \
- 	done
--	$(INSTALL) omshell $(DESTDIR)$(USERBINDIR)
--	$(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell
--	$(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \
--				$(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT)
- 
- depend:
- 	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC)
- 
- clean:
--	-rm -f $(OBJ) test.o svtest cltest.o cltest
-+	-rm -f $(OBJ) cltest.o cltest
- 
- realclean: clean
- 	-rm -f libdhcpctl.a *~ $(CATMANPAGES) $(SEDMANPAGES)
-@@ -82,7 +74,7 @@
- 	-rm -f Makefile
- 
- links:
--	@for foo in $(SRC) $(MAN) omshell.c cltest.c $(HDRS); do \
-+	@for foo in $(SRC) $(MAN) cltest.c $(HDRS); do \
- 	  if [ ! -b $$foo ]; then \
- 	    rm -f $$foo; \
- 	  fi; \
-@@ -95,12 +87,5 @@
- dhcpctl.man3:	dhcpctl.3
- 	sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
- 		-e "s#RUNDIR#$(VARRUN)#g" < dhcpctl.3 >dhcpctl.man3
--
--omshell.cat1:	omshell.man1
--	nroff -man omshell.man1 >omshell.cat1
--
--omshell.man1:	omshell.1
--	sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
--		-e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1
- 
- # Dependencies (semi-automatically-generated)
diff --git a/net/isc-dhcp31-server/files/patch-dhcpd.conf b/net/isc-dhcp31-server/files/patch-dhcpd.conf
deleted file mode 100644
index 030e89874d8d..000000000000
--- a/net/isc-dhcp31-server/files/patch-dhcpd.conf
+++ /dev/null
@@ -1,12 +0,0 @@
---- server/dhcpd.conf.orig	Thu Jan 25 03:33:11 2001
-+++ server/dhcpd.conf	Wed Jan 30 22:06:52 2002
-@@ -14,6 +14,9 @@
- # network, the authoritative directive should be uncommented.
- #authoritative;
- 
-+# ad-hoc DNS update scheme - set to "none" to disable dynamic DNS updates.
-+ddns-update-style ad-hoc;
-+
- # Use this to send dhcp log messages to a different log file (you also
- # have to hack syslog.conf to complete the redirection).
- log-facility local7;
diff --git a/net/isc-dhcp31-server/files/patch-dst::Makefile.dist b/net/isc-dhcp31-server/files/patch-dst::Makefile.dist
deleted file mode 100644
index ad45436b1629..000000000000
--- a/net/isc-dhcp31-server/files/patch-dst::Makefile.dist
+++ /dev/null
@@ -1,29 +0,0 @@
---- dst/Makefile.dist.orig	Sun Nov 17 03:27:43 2002
-+++ dst/Makefile.dist	Fri Mar  5 23:40:45 2004
-@@ -26,12 +26,24 @@
- 
- all:	libdst.a
- 
--install:
--
- libdst.a:	$(OBJ)
- 	rm -f dst.a
- 	ar cruv libdst.a $(OBJ)
- 	$(RANLIB) libdst.a
-+
-+install: all
-+	for dir in $(LIBDIR);\
-+	 do \
-+	  foo=""; \
-+	  for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
-+	    foo=$${foo}/$$bar; \
-+	    if [ ! -d $$foo ]; then \
-+	      mkdir $$foo; \
-+	      chmod 755 $$foo; \
-+	    fi; \
-+	  done; \
-+	done
-+	$(INSTALL) libdst.a $(DESTDIR)$(LIBDIR)
- 
- depend:
- 	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC)
diff --git a/net/isc-dhcp31-server/files/patch-freebsd b/net/isc-dhcp31-server/files/patch-freebsd
deleted file mode 100644
index 9fef4fdab877..000000000000
--- a/net/isc-dhcp31-server/files/patch-freebsd
+++ /dev/null
@@ -1,75 +0,0 @@
---- client/scripts/freebsd.orig	Sun Apr 27 21:44:01 2003
-+++ client/scripts/freebsd	Wed Mar  3 02:28:29 2004
-@@ -16,7 +16,7 @@
-       ( echo search $new_domain_name >/etc/resolv.conf )
-       exit_status=$?
-     else
--      rm /etc/resolv.conf
-+      ( rm /etc/resolv.conf )
-       exit_status=$?
-     fi
-     if [ $exit_status -ne 0 ]; then
-@@ -32,17 +32,17 @@
- # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
- exit_with_hooks() {
-   exit_status=$1
--  if [ -f /etc/dhclient-exit-hooks ]; then
--    . /etc/dhclient-exit-hooks
-+  if [ -f %%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 [ -f /etc/dhclient-enter-hooks ]; then
-+if [ -f %%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
-@@ -51,11 +51,11 @@
- fi
- 
- if [ x$new_network_number != x ]; then
--   $LOGGER New Network Number: $new_network_number
-+  $LOGGER "New Network Number: $new_network_number"
- fi
- 
- if [ x$new_broadcast_address != x ]; then
-- $LOGGER New Broadcast Address: $new_broadcast_address
-+  $LOGGER "New Broadcast Address: $new_broadcast_address"
-   new_broadcast_arg="broadcast $new_broadcast_address"
- fi
- if [ x$old_broadcast_address != x ]; then
-@@ -71,6 +71,15 @@
-   alias_subnet_arg="netmask $alias_subnet_mask"
- fi
- 
-+# Get the interface to which our default route is bound to.
-+if [ -x /usr/bin/netstat ]; then
-+	if_defaultroute=`/usr/bin/netstat -rn \
-+		| /usr/bin/grep "^default" \
-+		| /usr/bin/awk '{print $6}'`
-+else
-+	if_defaultroute=""
-+fi
-+
- if [ x$reason = xMEDIUM ]; then
-   eval "ifconfig $interface $medium"
-   eval "ifconfig $interface inet -alias 0.0.0.0 $medium" >/dev/null 2>&1
-@@ -113,7 +122,10 @@
-     eval "ifconfig $interface inet -alias $old_ip_address $medium"
-     route delete $old_ip_address 127.1 >/dev/null 2>&1
-     for router in $old_routers; do
--      route delete default $router >/dev/null 2>&1
-+	if [ x$if_defaultroute = x ] || [ x$if_defaultroute = x$interface ]
-+	 then
-+	      route delete default $router >/dev/null 2>&1
-+	fi
-     done
-     if [ -n "$old_static_routes" ]; then
-       set -- $old_static_routes
diff --git a/net/isc-dhcp31-server/files/patch-includes::cf::freebsd.h b/net/isc-dhcp31-server/files/patch-includes::cf::freebsd.h
deleted file mode 100644
index 9a3f4c636b09..000000000000
--- a/net/isc-dhcp31-server/files/patch-includes::cf::freebsd.h
+++ /dev/null
@@ -1,62 +0,0 @@
---- includes/cf/freebsd.h.orig	Wed Mar  3 02:32:39 2004
-+++ includes/cf/freebsd.h	Wed Mar  3 02:31:56 2004
-@@ -42,7 +42,7 @@
-  */
- 
- #include <syslog.h>
--#include <sys/types.h>
-+#include <sys/param.h>
- #include <string.h>
- #include <paths.h>
- #include <errno.h>
-@@ -101,6 +101,10 @@
- #define SOCKLEN_T int
- #endif
- 
-+#ifdef RESCUE
-+#define _PATH_DHCLIENT_SCRIPT	"/rescue/dhclient-script"
-+#endif
-+
- #if defined (USE_DEFAULT_NETWORK)
- #  define USE_BPF
- #endif
-@@ -111,6 +115,9 @@
-  #endif /* HAVE_DEV_RANDOM */
- 
- const char *cmds[] = {
-+#ifndef RESCUE
-+	/* rescue environment can't rely on these ... */
-+	/* Actually, /sbin/dhclient shouldn't use these, either. */
- 	"/bin/ps -axlw 2>&1",
- 	"/usr/sbin/arp -an 2>&1",
- 	"/usr/bin/netstat -an 2>&1",
-@@ -121,10 +128,12 @@
- 	"/usr/sbin/iostat  2>&1",
- 	"/usr/bin/vmstat  2>&1",
- 	"/usr/bin/w  2>&1",
-+#endif
- 	NULL
- };
- 
- const char *dirs[] = {
-+#ifndef RESCUE
- 	"/tmp",
- 	"/usr/tmp",
- 	".",
-@@ -134,13 +143,16 @@
- 	"/var/mail",
- 	"/home",
- 	"/usr/home",
-+#endif
- 	NULL
- };
- 
- const char *files[] = {
-+#ifndef RESCUE
- 	"/var/log/messages",
- 	"/var/log/wtmp",
- 	"/var/log/lastlog",
-+#endif
- 	NULL
- };
- #endif /* NEED_PRAND_CONF */
diff --git a/net/isc-dhcp31-server/files/patch-includes::dhcpd.h b/net/isc-dhcp31-server/files/patch-includes::dhcpd.h
deleted file mode 100644
index 1933e0b4037a..000000000000
--- a/net/isc-dhcp31-server/files/patch-includes::dhcpd.h
+++ /dev/null
@@ -1,56 +0,0 @@
---- includes/dhcpd.h.orig	Mon Feb 10 02:22:46 2003
-+++ includes/dhcpd.h	Wed Mar  3 16:20:09 2004
-@@ -99,6 +99,9 @@
- 	 (((x) >> OPTION_HASH_EXP) & \
- 	  (OPTION_HASH_PTWO - 1))) % OPTION_HASH_SIZE;
- 
-+#define NOLINK 0
-+#define HAVELINK 1
-+
- enum dhcp_shutdown_state {
- 	shutdown_listeners,
- 	shutdown_omapi_connections,
-@@ -783,6 +786,11 @@
- 	unsigned remote_id_len;		/* Length of Remote ID. */
- 
- 	char name [IFNAMSIZ];		/* Its name... */
-+	int ieee80211;                  /* True if media is ieee802.11 */
-+	int havemedia;                  /* True if we have a media table */
-+	int linkstate;                  /* True if we have link */
-+	int polling;                    /* True if polling is enabled */
-+	int forcediscover;              /* True if a discover is needed */
- 	int index;			/* Its index. */
- 	int rfdesc;			/* Its read file descriptor. */
- 	int wfdesc;			/* Its write file descriptor, if
-@@ -1845,6 +1853,9 @@
- extern const char *path_dhclient_pid;
- extern char *path_dhclient_script;
- extern int interfaces_requested;
-+#ifdef ENABLE_POLLING_MODE
-+extern int polling_interval;
-+#endif
- 
- extern struct client_config top_level_config;
- 
-@@ -1858,12 +1869,21 @@
- void send_decline PROTO ((void *));
- 
- void state_reboot PROTO ((void *));
-+#ifdef ENABLE_POLLING_MODE
-+void state_background PROTO ((void *));
-+void state_polling PROTO ((void *));
-+#endif
- void state_init PROTO ((void *));
- void state_selecting PROTO ((void *));
- void state_requesting PROTO ((void *));
- void state_bound PROTO ((void *));
- void state_stop PROTO ((void *));
- void state_panic PROTO ((void *));
-+
-+#if __FreeBSD_version > 502010
-+void set_ieee80211 PROTO ((struct interface_info *));
-+#endif
-+int interface_active PROTO ((struct interface_info *));
- 
- void bind_lease PROTO ((struct client_state *));
- 
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 1149e0c7925c..000000000000
--- a/net/isc-dhcp31-server/files/patch-site.conf
+++ /dev/null
@@ -1,42 +0,0 @@
---- site.conf.orig	Wed Jul  7 17:20:10 1999
-+++ site.conf	Wed Mar  3 14:00:14 2004
-@@ -1,2 +1,39 @@
- # Put local site configuration stuff here to override the default
- # settings in Makefile.conf
-+
-+PREFIX ?=	/usr/local
-+
-+USERBINDIR =	$(PREFIX)/bin
-+BINDIR =	$(PREFIX)/sbin
-+CLIENTBINDIR =	$(PREFIX)/sbin
-+ADMMANDIR =	$(PREFIX)/man/man8
-+ADMMANEXT =	.8
-+FFMANDIR =	$(PREFIX)/man/man5
-+FFMANEXT =	.5
-+LIBMANDIR =	$(PREFIX)/man/man3
-+LIBMANEXT =	.3
-+USRMANDIR =	$(PREFIX)/man/man1
-+USRMANEXT =	.1
-+MANCAT =	man
-+# INSTALL =	${INSTALL_DATA}
-+# MANINSTALL =	${INSTALL_MAN}
-+ETC =		$(PREFIX)/etc
-+LIBDIR =	${PREFIX}/lib
-+INCDIR =	${PREFIX}/include
-+CLIENT_PATH =	\"PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin\"
-+
-+DEBUG ?=	#none
-+
-+CFLAGS +=	-D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\"
-+CFLAGS +=	-D_PATH_DHCPD_DB=\"$(VARDB)/dhcpd.leases\"
-+CFLAGS +=	-D_PATH_DHCPD_PID=\"$(VARRUN)/dhcpd.pid\"
-+
-+CFLAGS +=	-D_PATH_DHCRELAY_PID=\"$(VARRUN)/dhcrelay.pid\"
-+
-+CFLAGS +=	-D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\"
-+CFLAGS +=	-D_PATH_DHCLIENT_SCRIPT=\"$(CLIENTBINDIR)/dhclient-script\"
-+CFLAGS +=	-D_PATH_DHCLIENT_DB=\"$(VARDB)/dhclient.leases\"
-+CFLAGS +=	-D_PATH_DHCLIENT_PID=\"$(VARRUN)/dhclient.pid\"
-+
-+CFLAGS +=	-Dwarn=dhcp_warn
-+CFLAGS +=	-DNOMINUM
diff --git a/net/isc-dhcp31-server/pkg-descr b/net/isc-dhcp31-server/pkg-descr
deleted file mode 100644
index 86bbb3cc62f0..000000000000
--- a/net/isc-dhcp31-server/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides a
-freely redistributable reference implementation of all aspects of the
-DHCP protocol, through a suite of DHCP tools:
-
-  * A DHCP server (this port)
-  * A DHCP client
-  * A DHCP relay agent
-
-Version 3 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. 
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp31-server/pkg-message b/net/isc-dhcp31-server/pkg-message
deleted file mode 100644
index 02c3fad98765..000000000000
--- a/net/isc-dhcp31-server/pkg-message
+++ /dev/null
@@ -1,15 +0,0 @@
-****  To setup dhcpd, you may have to copy %%PREFIX%%/etc/dhcpd.conf.sample
-      to %%PREFIX%%/etc/dhcpd.conf for editing.
-
-****  This port installs dhcp daemon, but don't invokes dhcpd by default. If
-      you want to invoke dhcpd at startup, put these lines into /etc/rc.conf.
-
-	    dhcpd_enable="YES"
-	    dhcpd_flags=""				# command option(s)
-	    dhcpd_conf="%%PREFIX%%/etc/dhcpd.conf"	# configuration file
-	    dhcpd_ifaces=""				# ethernet interface(s)
-
-****  For instance, rc.conf like variables are still read from
-      %%PREFIX%%/etc/rc.isc-dhcpd.conf. They should be move into
-      /etc/rc.conf.  Also, the dhcpd_options variable must be
-      renamed dhcpd_flags.
diff --git a/net/isc-dhcp31-server/pkg-plist b/net/isc-dhcp31-server/pkg-plist
deleted file mode 100644
index 3212362358fa..000000000000
--- a/net/isc-dhcp31-server/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $FreeBSD$
-bin/omshell
-etc/dhcpd.conf.sample
-etc/rc.d/isc-dhcpd.sh
-sbin/dhcpd
-%%PORTDOCS%%%%DOCSDIR%%/ANONCVS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec [ -f /var/db/dhcpd.leases ] || touch /var/db/dhcpd.leases
-@unexec [ -s /var/db/dhcpd.leases ] || rm -f /var/db/dhcpd.leases
diff --git a/net/isc-dhcp40-client/Makefile b/net/isc-dhcp40-client/Makefile
deleted file mode 100644
index 4b52a17c9736..000000000000
--- a/net/isc-dhcp40-client/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:    dhcp
-# Date created:         28 April 2003
-# Whom:                 cyrille.lefevre@laposte.net
-#
-# $FreeBSD$
-#
-
-MAINTAINER=	cyrille.lefevre@laposte.net
-COMMENT=	The ISC Dynamic Host Configuration Protocol client
-
-# Local variables
-#
-
-SUBSYS=		client
-
-# Local overrides
-#
-
-MASTERDIR=	${.CURDIR}/../isc-dhcp3-server
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/isc-dhcp40-client/pkg-descr b/net/isc-dhcp40-client/pkg-descr
deleted file mode 100644
index 7dc1bc78ea95..000000000000
--- a/net/isc-dhcp40-client/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides a
-freely redistributable reference implementation of all aspects of the
-DHCP protocol, through a suite of DHCP tools:
-
-  * A DHCP server
-  * A DHCP client (this port)
-  * A DHCP relay agent
-
-Version 3 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. 
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp40-client/pkg-message b/net/isc-dhcp40-client/pkg-message
deleted file mode 100644
index b406fd04fbd8..000000000000
--- a/net/isc-dhcp40-client/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-****  To setup dhclient, you may need to edit /etc/rc.conf to replace the
-      base system dhclient, such as :
-
-	    dhcp_program="%%PREFIX%%/sbin/dhclient"
-	    dhcp_flags="-q"
-
-      See dhclient(8), using the following command, for details about other
-      possible options:
-
-	    MANPATH=%%MAN1PREFIX%%/man man 8 dhclient
diff --git a/net/isc-dhcp40-client/pkg-plist b/net/isc-dhcp40-client/pkg-plist
deleted file mode 100644
index 47ce4cf59f64..000000000000
--- a/net/isc-dhcp40-client/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp40-client/Attic/pkg-plist,v 1.2 2004-03-05 22:03:02 sergei Exp $
-etc/dhclient.conf.sample
-@exec [ -f %D/etc/dhclient.conf ] || touch %D/etc/dhclient.conf
-@unexec [ -L %D/etc/dhclient.conf -o -s %D/etc/dhclient.conf ] || rm -f %D/etc/dhclient.conf
-sbin/dhclient
-sbin/dhclient-script
-%%PORTDOCS%%%%DOCSDIR%%/ANONCVS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec [ -f /var/run/dhclient.leases ] || touch /var/run/dhclient.leases
-@unexec [ -s /var/run/dhclient.leases ] || rm -f /var/run/dhclient.leases
diff --git a/net/isc-dhcp40-relay/Makefile b/net/isc-dhcp40-relay/Makefile
deleted file mode 100644
index e7626329f2ca..000000000000
--- a/net/isc-dhcp40-relay/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:    dhcp
-# Date created:         28 April 2003
-# Whom:                 cyrille.lefevre@laposte.net
-#
-# $FreeBSD$
-#
-
-MAINTAINER=	cyrille.lefevre@laposte.net
-COMMENT=	The ISC Dynamic Host Configuration Protocol relay
-
-# Local variables
-#
-
-SUBSYS=		relay
-
-# Local overrides
-#
-
-MASTERDIR=	${.CURDIR}/../isc-dhcp3-server
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/isc-dhcp40-relay/pkg-descr b/net/isc-dhcp40-relay/pkg-descr
deleted file mode 100644
index b764dbf45a19..000000000000
--- a/net/isc-dhcp40-relay/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides a
-freely redistributable reference implementation of all aspects of the
-DHCP protocol, through a suite of DHCP tools:
-
-  * A DHCP server
-  * A DHCP client
-  * A DHCP relay agent (this port)
-
-Version 3 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. 
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp40-relay/pkg-message b/net/isc-dhcp40-relay/pkg-message
deleted file mode 100644
index af6992fb34a5..000000000000
--- a/net/isc-dhcp40-relay/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-****  This port installs dhcp relay daemon, but don't invokes dhcrelay by
-      default. If you want to invoke dhcrelay at startup, put these lines
-      into /etc/rc.conf.
-
-	    dhcrelay_enable="YES"
-	    dhcrelay_flags=""		# command option(s)
-	    dhcrelay_servers=""		# dhcrelay server(s)
-	    dhcrelay_ifaces=""		# ethernet interface(s)
-
-****  For instance, rc.conf like variables are still read from
-      %%PREFIX%%/etc/rc.isc-dhcrelay.conf. They should be move
-      into /etc/rc.conf. Also, the dhcrelay_options variable
-      must be renamed dhcrelay_flags.
diff --git a/net/isc-dhcp40-relay/pkg-plist b/net/isc-dhcp40-relay/pkg-plist
deleted file mode 100644
index 67b347d8baad..000000000000
--- a/net/isc-dhcp40-relay/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp40-relay/Attic/pkg-plist,v 1.3 2004-03-16 20:31:14 des Exp $
-etc/rc.d/isc-dhcrelay.sh
-sbin/dhcrelay
-%%PORTDOCS%%%%DOCSDIR%%/ANONCVS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
deleted file mode 100644
index 291e831481f3..000000000000
--- a/net/isc-dhcp40-server/Makefile
+++ /dev/null
@@ -1,243 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:    dhcp
-# Date created:         7 Mar 1996
-# Whom:                 se
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dhcp
-PORTVERSION=	3.0.1.r12
-PORTREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
-PKGNAMEPREFIX=	isc-
-PKGNAMESUFFIX=	3-${SUBSYS}
-DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
-
-MAINTAINER=	cyrille.lefevre@laposte.net
-COMMENT?=	The ISC Dynamic Host Configuration Protocol server
-
-USE_REINPLACE=	yes
-USE_RC_SUBR=	yes
-
-.include <bsd.port.pre.mk>
-
-# Global variables
-#
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--subsys ${SUBSYS}
-ALL_TARGET=	all.${SUBSYS}
-INSTALL_TARGET=	install.${SUBSYS}
-
-SUBSYS?=	server
-
-.if ${SUBSYS} == client
-MAN5=		dhclient.conf.5 dhclient.leases.5
-MAN8=		dhclient.8 dhclient-script.8
-.elif ${SUBSYS} == server
-MAN1=		omshell.1
-MAN5=		dhcpd.conf.5 dhcpd.leases.5
-MAN8=		dhcpd.8
-.elif ${SUBSYS} == relay
-MAN8=		dhcrelay.8
-.else
-MAN3=		dhcpctl.3 omapi.3
-.endif
-.if ${SUBSYS} != relay
-MAN5+=		dhcp-eval.5 dhcp-options.5
-.endif
-
-MSG_FILE=	${.CURDIR}/pkg-message
-DESCR=		${.CURDIR}/pkg-descr
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PLIST=		${.CURDIR}/pkg-plist
-
-# Local variables
-#
-
-# for instance, possible versions are:
-#	1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2
-# which have to become:
-#	1.2rc3pl4 (or 1.2beta3pl4), 1.2rc3 (or 1.2beta3), 1.2pl3, 1.2
-# so, the magic things are:
-VERSION=
-PATCHLEVEL=
-.if ${PORTVERSION:R:E:M[br]*} != ""
-RELEASE=	${PORTVERSION:R:R}
-VERSION=	${PORTVERSION:R:E:S/b/beta/:S/r/rc/}
-PATCHLEVEL=	pl${PORTVERSION:E}
-.elif ${PORTVERSION:E:M[br]*} != ""
-RELEASE=	${PORTVERSION:R}
-VERSION=	${PORTVERSION:E:S/b/beta/:S/r/rc/}
-.elif ${PORTVERSION:R:E} != ""
-RELEASE=	${PORTVERSION:R}
-PATCHLEVEL=	pl${PORTVERSION:E}
-.else
-RELEASE=	${PORTVERSION}
-.endif
-
-PATCH_SUBDIRS=	common minires dst omapip
-.if ${SUBSYS} == server || ${SUBSYS} == devel
-PATCH_SUBDIRS+=	dhcpctl
-.endif
-.if ${SUBSYS} != devel
-PATCH_SUBDIRS+=	${SUBSYS}
-.endif
-.if ${SUBSYS} == server
-PATCH_SUBDIRS+=	omshell
-.endif
-
-.if ${SUBSYS} == client
-BIN_FILES=	dhclient
-CONF_FILES=	dhclient.conf
-SAMP_FILES=	client/dhclient.conf
-DATA_FILES=	dhclient.leases
-.elif ${SUBSYS} == server
-BIN_FILES=	dhcpd omshell
-RC_FILES=	isc-dhcpd
-SAMP_FILES=	server/dhcpd.conf
-DATA_FILES=	dhcpd.leases
-.elif ${SUBSYS} == relay
-BIN_FILES=	dhcrelay
-RC_FILES=	isc-dhcrelay
-.endif
-DOC_FILES=	ANONCVS CHANGES COPYRIGHT README RELNOTES
-
-SAMP_SUFX=	.sample
-
-CONF_DIR=	${PREFIX}/etc
-RC_DIR=		${PREFIX}/etc/rc.d
-DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
-DATADIR=	/var/db
-
-REINPLACE_SUB=	PREFIX=${PREFIX}
-RCSCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
-PKGMESSAGE_SUB=	PREFIX=${PREFIX} MAN1PREFIX=${MAN1PREFIX}
-
-# Pre-everything
-#
-
-.if ${SUBSYS} == client && !defined(WITHOUT_INTERFACE_POLLING)
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile without interface polling support."
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_INTERFACE_POLLING=yes\""
-	@${ECHO_MSG}
-.endif
-
-# Post-extract
-#
-
-post-extract: extract-omshell
-
-extract-omshell:
-	@${MKDIR} ${WRKSRC}/omshell
-	@${MV} ${WRKSRC}/dhcpctl/omshell.? ${WRKSRC}/omshell
-	@${CP} ${FILESDIR}/omshell::Makefile.dist \
-		${WRKSRC}/omshell/Makefile.dist
-
-# Post-patch
-#
-
-post-patch: patch-scripts patch-makefile-conf \
-	    patch-makefiles-dist patch-man-pages \
-	    patch-pkgmessage patch-site-conf \
-	    patch-rc-scripts
-
-patch-scripts:
-	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${WRKSRC}/client/dhclient.conf \
-		${WRKSRC}/client/scripts/freebsd
-
-patch-site-conf:
-.if ${SUBSYS} == client && !defined(WITHOUT_INTERFACE_POLLING)
-	@${ECHO_CMD} CFLAGS += -DENABLE_POLLING_MODE >> ${WRKSRC}/site.conf
-.endif
-
-patch-makefile-conf:
-	@${REINPLACE_CMD} -e 's|^DEBUG[ 	]*=|# DEBUG ?=|g' \
-		${WRKSRC}/Makefile.conf
-
-patch-makefiles-dist:
-.for subdir in ${PATCH_SUBDIRS}
-	@${REINPLACE_CMD} -e 's|^CFLAGS[ 	]*=|CFLAGS +=|g' \
-		${WRKSRC}/${subdir}/Makefile.dist
-.endfor
-
-# temporary hack - no patch file needed for this typo.
-patch-man-pages:
-	@${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3
-
-patch-rc-scripts:
-.for f in ${RC_FILES}
-	@${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/${f}.sh${SAMP_SUFX} > ${WRKDIR}/${f}.sh
-.endfor
-
-patch-pkgmessage:
-.if ${SUBSYS} != devel
-	@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${MSG_FILE} > ${PKGMESSAGE}
-.endif
-
-# Post-install
-#
-
-post-install: strip-binary-files install-startup-files \
-	      install-doc-files install-sample-files \
-	      create-conf-files create-data-files \
-	      display-message
-
-strip-binary-files:
-.for f in ${BIN_FILES}
-.if exists(${PREFIX}/bin/${f})
-	@${STRIP_CMD} ${PREFIX}/bin/${f}
-.endif
-.if exists(${PREFIX}/sbin/${f})
-	@${STRIP_CMD} ${PREFIX}/sbin/${f}
-.endif
-.endfor
-
-install-startup-files:
-.for f in ${RC_FILES}
-	@${INSTALL_SCRIPT} ${WRKDIR}/${f}.sh ${RC_DIR}
-.endfor
-
-install-doc-files:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for f in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
-
-install-sample-files:
-.for f in ${SAMP_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${CONF_DIR}/${f:T}${SAMP_SUFX}
-.endfor
-
-create-conf-files:
-.for f in ${CONF_FILES}
-.if !exists(${CONF_DIR}/${f})
-	@${TOUCH} ${CONF_DIR}/${f}
-.endif
-.endfor
-
-create-data-files:
-.for f in ${DATA_FILES}
-.if !exists(${DATADIR}/${f})
-	@${TOUCH} ${DATADIR}/${f}
-.endif
-.endfor
-
-display-message:
-.if ${SUBSYS} != devel
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/isc-dhcp40-server/distinfo b/net/isc-dhcp40-server/distinfo
deleted file mode 100644
index a806bc46fa23..000000000000
--- a/net/isc-dhcp40-server/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (dhcp-3.0.1rc12.tar.gz) = cf00193dcf349c888a62e4462ae1eb9c
-SIZE (dhcp-3.0.1rc12.tar.gz) = 857323
diff --git a/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample
deleted file mode 100644
index 63bc57ba0f3d..000000000000
--- a/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: dhcpd
-# REQUIRE: DAEMON
-# KEYWORD: FreeBSD
-#
-# Add the following line to /etc/rc.conf to enable dhcpd:
-#
-# dhcpd_enable="YES"
-#
-
-# override these variables in /etc/rc.conf
-dhcpd_enable=NO
-dhcpd_flags=				# command option(s)
-dhcpd_conf=%%PREFIX%%/etc/dhcpd.conf	# configuration file
-dhcpd_ifaces=				# ethernet interface(s)
-
-dhcpd_precmd ()
-{
-	dhcpd_rcconf=%%PREFIX%%/etc/rc.isc-dhcpd.conf
-
-	if [ -f ${dhcpd_rcconf} ]; then
-		warn "${dhcpd_rcconf} is obsolete, use /etc/rc.conf instead."
-		. ${dhcpd_rcconf}
-
-		if [ -n "${dhcpd_options}" -a -z "${rc_flags}" ]; then
-			warn "dhcpd_options is obsolete, use dhcpd_flags instead."
-			rc_flags=${dhcpd_options}
-		fi
-	fi
-
-	rc_flags="${rc_flags} -cf ${dhcpd_conf} ${dhcpd_ifaces}"
-}
-
-. %%RC_SUBR%%
-
-name=dhcpd
-rcvar=$(set_rcvar)
-
-command=%%PREFIX%%/sbin/${name}
-pidfile=/var/run/${name}.pid
-required_files=${dhcpd_conf}
-start_precmd=${name}_precmd
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample
deleted file mode 100644
index 4302d7360ff1..000000000000
--- a/net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: dhcrelay
-# REQUIRE: DAEMON
-# KEYWORD: FreeBSD
-#
-# Add the following line to /etc/rc.conf to enable dhcrelay:
-#
-# dhcrelay_enable="YES"
-#
-
-# override these variables in /etc/rc.conf
-dhcrelay_enable=NO
-dhcrelay_flags=				# command option(s)
-dhcrelay_servers=			# dhcrelay server(s)
-dhcrelay_ifaces=			# ethernet interface(s)
-
-dhcrelay_precmd ()
-{
-	local ifaces
-
-	dhcrelay_rcconf=%%PREFIX%%/etc/rc.isc-dhcrelay.conf
-
-	if [ -f ${dhcrelay_rcconf} ]; then
-		warn "${dhcrelay_rcconf} is obsolete, use /etc/rc.conf instead."
-		. ${dhcrelay_rcconf}
-
-		if [ -n "${dhcrelay_options}" -a -z "${rc_flags}" ]; then
-			warn "dhcrelay_options is obsolete, use dhcrelay_flags instead."
-			rc_flags=${dhcrelay_options}
-		fi
-	fi
-
-	if [ -z "${dhcrelay_servers}" ]; then
-		err 1 "no dhcrelay server(s) configured."
-	fi
-
-	ifaces=
-	for iface in ${dhcrelay_ifaces}; do
-		ifaces="${ifaces} -i ${iface}"
-	done
-
-	rc_flags="${rc_flags} ${ifaces} ${dhcrelay_servers}"
-}
-
-. %%RC_SUBR%%
-
-name=dhcrelay
-rcvar=$(set_rcvar)
-
-command=%%PREFIX%%/sbin/${name}
-pidfile=/var/run/${name}.pid
-start_precmd=${name}_precmd
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/net/isc-dhcp40-server/files/omshell::Makefile.dist b/net/isc-dhcp40-server/files/omshell::Makefile.dist
deleted file mode 100644
index 34c90a2e7f53..000000000000
--- a/net/isc-dhcp40-server/files/omshell::Makefile.dist
+++ /dev/null
@@ -1,80 +0,0 @@
-# Makefile.dist
-#
-# Copyright (c) 1996-2002 Internet Software Consortium.
-# Use is subject to license terms which appear in the file named
-# ISC-LICENSE that should have accompanied this file when you
-# received it.   If a file named ISC-LICENSE did not accompany this
-# file, or you are not sure the one you have is correct, you may
-# obtain an applicable copy of the license at:
-#
-#             http://www.isc.org/isc-license-1.0.html. 
-#
-# This file is part of the ISC DHCP distribution.   The documentation
-# associated with this file is listed in the file DOCUMENTATION,
-# included in the top-level directory of this release.
-#
-# Support and other services are available for ISC products - see
-# http://www.isc.org for more information.
-#
-
-CATMANPAGES = omshell.cat1
-SEDMANPAGES = omshell.man1
-SRCS   = omshell.c
-OBJS   = omshell.o
-PROG   = omshell
-MAN    = omshell.1
-
-INCLUDES = -I$(TOP)/dhcpctl $(BINDINC) -I$(TOP)/includes
-CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
-DHCPCTLLIBS = ../dhcpctl/libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \
-		../omapip/libomapi.a ../dst/libdst.a
-
-all:	$(PROG) $(CATMANPAGES)
-
-$(PROG):	$(OBJS) $(DHCPCTLLIBS)
-	$(CC) $(DEBUG) $(LFLAGS) -o $(PROG) $(OBJS) $(DHCPCTLLIBS) $(LIBS)
-
-install: all $(CATMANPAGES)
-	for dir in $(USRMANDIR) $(USERBINDIR); do \
-	  foo=""; \
-	  for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
-	    foo=$${foo}/$$bar; \
-	    if [ ! -d $$foo ]; then \
-	      mkdir $$foo; \
-	      chmod 755 $$foo; \
-	    fi; \
-	  done; \
-	done
-	$(INSTALL) omshell $(DESTDIR)$(USERBINDIR)
-	$(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell
-	$(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \
-				$(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT)
-
-depend:
-	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS)
-
-clean:
-	-rm -f $(OBJS)
-
-realclean: clean
-	-rm -f $(PROG) *~ $(CATMANPAGES) $(SEDMANPAGES) #*
-
-distclean: realclean
-	-rm -f Makefile
-
-links:
-	@for foo in $(SRCS) $(MAN); do \
-	  if [ ! -b $$foo ]; then \
-	    rm -f $$foo; \
-	  fi; \
-	  ln -s $(TOP)/omshell/$$foo $$foo; \
-	done
-
-omshell.cat1:	omshell.man1
-	nroff -man omshell.man1 >omshell.cat1
-
-omshell.man1:	omshell.1
-	sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
-		-e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1
-
-# Dependencies (semi-automatically-generated)
diff --git a/net/isc-dhcp40-server/files/patch-Makefile b/net/isc-dhcp40-server/files/patch-Makefile
deleted file mode 100644
index 7a8df08b137b..000000000000
--- a/net/isc-dhcp40-server/files/patch-Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
---- Makefile.orig	Fri Nov  8 00:10:07 2002
-+++ Makefile	Mon Apr 28 15:04:50 2003
-@@ -38,59 +38,59 @@
- # ``http://www.nominum.com''.
- #
- 
--all:
-+all all.devel all.server all.relay all.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make all); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--install:
-+install install.devel install.server install.relay install.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make install); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--depend:
-+depend depend.devel depend.server depend.relay depend.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make depend); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--clean:
-+clean clean.devel clean.server clean.relay clean.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make clean); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--realclean:
-+realclean realclean.devel realclean.server realclean.relay realclean.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make realclean); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--distclean:
-+distclean distclean.devel distclean.server distclean.relay distclean.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make distclean); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--links:
-+links links.devel links.server links.relay links.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make links); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
diff --git a/net/isc-dhcp40-server/files/patch-Makefile.dist b/net/isc-dhcp40-server/files/patch-Makefile.dist
deleted file mode 100644
index 9edab8fa4571..000000000000
--- a/net/isc-dhcp40-server/files/patch-Makefile.dist
+++ /dev/null
@@ -1,243 +0,0 @@
---- Makefile.dist.orig	Fri Nov  8 00:10:08 2002
-+++ Makefile.dist	Tue Apr 29 00:07:43 2003
-@@ -3,13 +3,13 @@
- # Copyright (c) 1996-2002 Internet Software Consortium.
- # Use is subject to license terms which appear in the file named
- # ISC-LICENSE that should have accompanied this file when you
--# received it.   If a file named ISC-LICENSE did not accompany this
-+# received it.  If a file named ISC-LICENSE did not accompany this
- # file, or you are not sure the one you have is correct, you may
- # obtain an applicable copy of the license at:
- #
--#             http://www.isc.org/isc-license-1.0.html. 
-+#            http://www.isc.org/isc-license-1.0.html. 
- #
--# This file is part of the ISC DHCP distribution.   The documentation
-+# This file is part of the ISC DHCP distribution.  The documentation
- # associated with this file is listed in the file DOCUMENTATION,
- # included in the top-level directory of this release.
- #
-@@ -17,47 +17,200 @@
- # http://www.isc.org for more information.
- #
- 
--SUBDIRS=	common $(MINIRES) dst omapip server client relay dhcpctl
-+COMMON_SUBDIRS=	common
-+DEVEL_SUBDIRS=	$(MINIRES) dst omapip dhcpctl
-+SERVER_SUBDIRS=	omshell server
-+RELAY_SUBDIRS=	relay
-+CLIENT_SUBDIRS=	client
-+
-+DEVEL_BUILD_SUBDIRS=	${COMMON_SUBDIRS} ${DEVEL_SUBDIRS}
-+SERVER_BUILD_SUBDIRS=	${SERVER_SUBDIRS}
-+RELAY_BUILD_SUBDIRS=	${RELAY_SUBDIRS}
-+CLIENT_BUILD_SUBDIRS=	${CLIENT_SUBDIRS}
-+
-+DEVEL_INSTALL_SUBDIRS=	${COMMON_SUBDIRS} ${DEVEL_SUBDIRS}
-+SERVER_INSTALL_SUBDIRS=	${COMMON_SUBDIRS} ${SERVER_SUBDIRS}
-+RELAY_INSTALL_SUBDIRS=	${RELAY_SUBDIRS}
-+CLIENT_INSTALL_SUBDIRS=	${COMMON_SUBDIRS} ${CLIENT_SUBDIRS}
- 
--all:
--	@for dir in ${SUBDIRS}; do \
-+all: all.server all.relay all.client
-+
-+all.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Making all in $$dir"; \
-+		(cd $$dir; $(MAKE) all) || exit 1; \
-+	done
-+
-+all.server: all.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Making all in $$dir"; \
-+		(cd $$dir; $(MAKE) all) || exit 1; \
-+	done
-+
-+all.relay: all.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Making all in $$dir"; \
-+		(cd $$dir; $(MAKE) all) || exit 1; \
-+	done
-+
-+all.client: all.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
- 		echo "Making all in $$dir"; \
- 		(cd $$dir; $(MAKE) all) || exit 1; \
--	 done
-+	done
-+
-+install: install.devel install.server install.relay install.client
-+
-+install.devel:
-+	@for dir in ${DEVEL_INSTALL_SUBDIRS}; do \
-+		echo "Installing in $$dir"; \
-+		(cd $$dir; $(MAKE) install) || exit 1; \
-+	done
- 
--install:
--	@for dir in ${SUBDIRS}; do \
-+install.server:
-+	@for dir in ${SERVER_INSTALL_SUBDIRS}; do \
- 		echo "Installing in $$dir"; \
- 		(cd $$dir; $(MAKE) install) || exit 1; \
--	 done
-+	done
- 
--depend:
--	@for dir in ${SUBDIRS}; do \
-+install.relay:
-+	@for dir in ${RELAY_INSTALL_SUBDIRS}; do \
-+		echo "Installing in $$dir"; \
-+		(cd $$dir; $(MAKE) install) || exit 1; \
-+	done
-+
-+install.client:
-+	@for dir in ${CLIENT_INSTALL_SUBDIRS}; do \
-+		echo "Installing in $$dir"; \
-+		(cd $$dir; $(MAKE) install) || exit 1; \
-+	done
-+
-+depend: depend.server depend.relay depend.client
-+
-+depend.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Making dependencies in $$dir"; \
-+		(cd $$dir; $(MAKE) depend) || exit 1; \
-+	done
-+
-+depend.server: depend.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Making dependencies in $$dir"; \
-+		(cd $$dir; $(MAKE) depend) || exit 1; \
-+	done
-+
-+depend.relay: depend.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
- 		echo "Making dependencies in $$dir"; \
- 		(cd $$dir; $(MAKE) depend) || exit 1; \
--	 done
-+	done
-+
-+depend.client: depend.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
-+		echo "Making dependencies in $$dir"; \
-+		(cd $$dir; $(MAKE) depend) || exit 1; \
-+	done
-+
-+clean: clean.server clean.relay clean.client
-+
-+clean.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) clean) || exit 1; \
-+	done
-+
-+clean.server: clean.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) clean) || exit 1; \
-+	done
-+
-+clean.relay: clean.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) clean) || exit 1; \
-+	done
- 
--clean:
--	@for dir in ${SUBDIRS}; do \
-+clean.client: clean.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
- 		echo "Cleaning in $$dir"; \
- 		(cd $$dir; $(MAKE) clean) || exit 1; \
--	 done
-+	done
-+
-+realclean: realclean.server realclean.relay realclean.client
-+
-+realclean.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) realclean) || exit 1; \
-+	done
- 
--realclean:
--	@for dir in ${SUBDIRS}; do \
-+realclean.server: realclean.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
- 		echo "Really cleaning in $$dir"; \
- 		(cd $$dir; $(MAKE) realclean) || exit 1; \
--	 done
-+	done
- 
--distclean:
--	@for dir in ${SUBDIRS}; do \
-+realclean.relay: realclean.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) realclean) || exit 1; \
-+	done
-+
-+realclean.client: realclean.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
-+		echo "Really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) realclean) || exit 1; \
-+	done
-+
-+distclean: distclean.server distclean.relay distclean.client
-+
-+distclean.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
- 		echo "Really, really cleaning in $$dir"; \
- 		(cd $$dir; $(MAKE) distclean) || exit 1; \
--	 done
--	@rm -f Makefile
-+	done
-+
-+distclean.server: distclean.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Really, really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) distclean) || exit 1; \
-+	done
-+
-+distclean.relay: distclean.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Really, really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) distclean) || exit 1; \
-+	done
-+
-+distclean.client: distclean.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
-+		echo "Really, really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) distclean) || exit 1; \
-+	done
-+
-+links: links.server links.relay links.client
-+
-+links.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Making links in $$dir"; \
-+		(cd $$dir; $(MAKE) links) || exit 1; \
-+	done
-+
-+links.server: links.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Making links in $$dir"; \
-+		(cd $$dir; $(MAKE) links) || exit 1; \
-+	done
-+
-+links.relay: links.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Making links in $$dir"; \
-+		(cd $$dir; $(MAKE) links) || exit 1; \
-+	done
- 
--links:
--	@for dir in ${SUBDIRS}; do \
-+links.client: links.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
- 		echo "Making links in $$dir"; \
- 		(cd $$dir; $(MAKE) links) || exit 1; \
--	 done
-+	done
diff --git a/net/isc-dhcp40-server/files/patch-client::clparse.c b/net/isc-dhcp40-server/files/patch-client::clparse.c
deleted file mode 100644
index 4140cc6e3109..000000000000
--- a/net/isc-dhcp40-server/files/patch-client::clparse.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/clparse.c.orig	Mon Feb 10 01:39:57 2003
-+++ client/clparse.c	Wed Mar  3 01:35:39 2004
-@@ -785,7 +785,7 @@
- 		if (status != ISC_R_SUCCESS)
- 			log_fatal ("Can't record interface %s: %s",
- 				   name, isc_result_totext (status));
--		strcpy (ip -> name, name);
-+		strlcpy (ip -> name, name, IFNAMSIZ);
- 		if (dummy_interfaces) {
- 			interface_reference (&ip -> next,
- 					     dummy_interfaces, MDL);
diff --git a/net/isc-dhcp40-server/files/patch-client::dhclient.8 b/net/isc-dhcp40-server/files/patch-client::dhclient.8
deleted file mode 100644
index a602907c31b6..000000000000
--- a/net/isc-dhcp40-server/files/patch-client::dhclient.8
+++ /dev/null
@@ -1,83 +0,0 @@
---- client/dhclient.8.orig	Sun Nov 17 03:25:43 2002
-+++ client/dhclient.8	Wed Mar  3 02:06:52 2004
-@@ -18,6 +18,10 @@
- .\"
- .\" $Id: dhclient.8,v 1.12.2.7 2002/11/17 02:25:43 dhankins Exp $
- .\"
-+.\" Portions copyright (c) 2000 David E. O'Brien.
-+.\" All rights reserved.
-+.\" $FreeBSD$
-+.\"
- .TH dhclient 8
- .SH NAME
- dhclient - Dynamic Host Configuration Protocol Client
-@@ -28,12 +32,18 @@
- .I port
- ]
- [
-+.B -D
-+]
-+[
- .B -d
- ]
- [
- .B -q
- ]
- [
-+.B -v
-+]
-+[
- .B -1
- ]
- [
-@@ -64,6 +74,10 @@
- relay
- ]
- [
-+.B -i
-+interval
-+]
-+[
- .B -n
- ]
- [
-@@ -148,6 +162,15 @@
- configuration file or on the command line, and will ignore all other
- interfaces.
- .PP
-+The
-+.B -D
-+flag causes
-+.B dhclient
-+to save the script it creates for use in conjunction with
-+.B dhclient-script
-+in
-+.IR /tmp.
-+.PP
- If the DHCP client should listen and transmit on a port other than the
- standard (port 68), the
- .B -p
-@@ -171,6 +194,12 @@
- flag, followed by the IP address to send.   This is only useful for testing,
- and should not be expected to work in any consistent or useful way.
- .PP
-+On FreeBSD, dhclient can be enabled to automatically handle the
-+link status of the network card. Normally polling is done every
-+five seconds. The polling interval can be set using the
-+.B -i
-+flag, followed by the numbers of seconds. Minimum is one second.
-+.PP
- The DHCP client will normally run in the foreground until it has
- configured an interface, and then will revert to running in the
- background.   To run force dhclient to always run as a foreground
-@@ -188,6 +217,10 @@
- .B -q
- flag prevents any messages other than errors from being printed to the
- standard error descriptor.
-+.B -v
-+flag turns on all messages.
-+Opposite of
-+.B -q .
- .PP
- The client normally doesn't release the current lease as it is not
- required by the DHCP protocol.  Some cable ISPs require their clients
diff --git a/net/isc-dhcp40-server/files/patch-client::dhclient.c b/net/isc-dhcp40-server/files/patch-client::dhclient.c
deleted file mode 100644
index 27cef99162df..000000000000
--- a/net/isc-dhcp40-server/files/patch-client::dhclient.c
+++ /dev/null
@@ -1,545 +0,0 @@
---- client/dhclient.c.orig	Sat Apr 26 23:51:39 2003
-+++ client/dhclient.c	Wed Mar  3 16:21:02 2004
-@@ -47,6 +47,13 @@
- #include "dhcpd.h"
- #include "version.h"
- 
-+#if __FreeBSD_version > 502010
-+#include <sys/ioctl.h>
-+#include <net/if_media.h>
-+#include <net80211/ieee80211_ioctl.h>
-+#include <net80211/ieee80211.h>
-+#endif
-+
- TIME cur_time;
- TIME default_lease_time = 43200; /* 12 hours... */
- TIME max_lease_time = 86400; /* 24 hours... */
-@@ -82,8 +89,11 @@
- struct string_list *client_env=NULL;
- int client_env_count=0;
- int onetry=0;
--int quiet=0;
-+int quiet=1;
- int nowait=0;
-+#ifdef ENABLE_POLLING_MODE
-+int polling_interval = 5;
-+#endif
- 
- static void usage PROTO ((void));
- 
-@@ -184,6 +194,9 @@
- 		} else if (!strcmp (argv [i], "-q")) {
- 			quiet = 1;
- 			quiet_interface_discovery = 1;
-+		} else if (!strcmp (argv [i], "-v")) {
-+			quiet = 0;
-+			quiet_interface_discovery = 0;
- 		} else if (!strcmp (argv [i], "-s")) {
- 			if (++i == argc)
- 				usage ();
-@@ -197,6 +210,19 @@
- 		} else if (!strcmp (argv [i], "-n")) {
- 			/* do not start up any interfaces */
- 			interfaces_requested = 1;
-+#ifdef ENABLE_POLLING_MODE
-+		} else if (!strcmp (argv [i], "-i")) {
-+			if (++i == argc)
-+				usage ();
-+			polling_interval = (int)strtol (argv [i],
-+			    (char **)NULL, 10);
-+			if (polling_interval <= 0) {
-+				log_info ("Incorrect polling interval %d",
-+				    polling_interval);
-+				log_info ("Using a default of 5 seconds");
-+				polling_interval = 5;
-+			}
-+#endif
- 		} else if (!strcmp (argv [i], "-w")) {
- 			/* do not exit if there are no broadcast interfaces. */
- 			persist = 1;
-@@ -225,7 +251,16 @@
- 		    if (strlen (argv [i]) > sizeof tmp -> name)
- 			    log_fatal ("%s: interface name too long (max %ld)",
- 				       argv [i], (long)strlen (argv [i]));
-- 		    strcpy (tmp -> name, argv [i]);
-+ 		    strlcpy (tmp -> name, argv [i], IFNAMSIZ);
-+#if __FreeBSD_version > 502010
-+		    set_ieee80211 (tmp);
-+#endif
-+		    /* Init some interface vars, enable polling */
-+#ifdef ENABLE_POLLING_MODE
-+		    tmp -> forcediscover = 0;
-+		    tmp -> linkstate = HAVELINK;
-+		    tmp -> polling = 1;
-+#endif /* ifdef ENABLE_POLLING_MODE */
- 		    if (interfaces) {
- 			    interface_reference (&tmp -> next,
- 						 interfaces, MDL);
-@@ -385,6 +420,16 @@
- 					     INTERFACE_AUTOMATIC)) !=
- 			     INTERFACE_REQUESTED))
- 				continue;
-+#if __FreeBSD_version > 502010
-+			set_ieee80211 (ip);
-+#endif
-+#ifdef ENABLE_POLLING_MODE
-+			ip -> forcediscover = 0;
-+			if (ip -> client -> config -> media != NULL)
-+				ip -> havemedia = 1;
-+			else
-+				ip -> havemedia = 0;
-+#endif
- 			script_init (ip -> client,
- 				     "PREINIT", (struct string_list *)0);
- 			if (ip -> client -> alias)
-@@ -427,8 +472,13 @@
- 				client -> state = S_INIT;
- 				/* Set up a timeout to start the initialization
- 				   process. */
-+#ifdef ENABLE_POLLING_MODE
-+				add_timeout (cur_time + random () % 5 + 2,
-+					     state_polling, client, 0, 0);
-+#else
- 				add_timeout (cur_time + random () % 5,
- 					     state_reboot, client, 0, 0);
-+#endif
- 			}
- 		}
- 	}
-@@ -486,9 +536,9 @@
- 	log_info (arr);
- 	log_info (url);
- 
--	log_error ("Usage: dhclient [-1dqr] [-nw] [-p <port>] %s",
--		   "[-s server]");
--	log_error ("                [-cf config-file] [-lf lease-file]%s",
-+	log_error ("Usage: dhclient [-1Ddqrv] [-i polling-interval] %s",
-+		   "[-nw] [-p <port>] [-s server]");
-+	log_error ("                [-cf config-file] [-lf lease-file] %s",
- 		   "[-pf pid-file] [-e VAR=val]");
- 	log_fatal ("                [-sf script-file] [interface]");
- }
-@@ -876,6 +926,15 @@
- 	/* Write out the new lease. */
- 	write_client_lease (client, client -> new, 0, 0);
- 
-+	/*
-+	 * It's now possible that state_reboot can be called
-+	 * after a interface link went down and is up again.
-+	 * To prevent tons of equal leases saved on disk, we rewrite
-+	 * them.
-+	 */
-+	read_client_leases ();
-+	rewrite_client_leases ();
-+ 
- 	/* Replace the old active lease with the new one. */
- 	if (client -> active)
- 		destroy_client_lease (client -> active);
-@@ -890,6 +949,12 @@
- 	      piaddr (client -> active -> address),
- 	      (long)(client -> active -> renewal - cur_time));
- 	client -> state = S_BOUND;
-+#ifdef ENABLE_POLLING_MODE
-+	/* Init some interface vars, enable polling */
-+	client -> interface -> linkstate = HAVELINK;
-+	client -> interface -> forcediscover = 0;
-+	client -> interface -> polling = 1;
-+#endif /* ifdef ENABLE_POLLING_MODE */
- 	reinitialize_interfaces ();
- 	go_daemon ();
- 	if (client -> config -> do_forward_update) {
-@@ -1352,6 +1417,11 @@
- 	int interval;
- 	int increase = 1;
- 
-+#ifdef ENABLE_POLLING_MODE
-+	/* Disable polling for this interface */
-+	client -> interface -> polling = 0;
-+#endif
-+
- 	/* Figure out how long it's been since we started transmitting. */
- 	interval = cur_time - client -> first_sending;
- 
-@@ -1457,6 +1527,9 @@
- 	struct client_lease *loop;
- 	struct client_lease *lp;
- 
-+	if (client -> interface -> linkstate == NOLINK)
-+		return;
-+
- 	loop = lp = client -> active;
- 
- 	log_info ("No DHCPOFFERS received.");
-@@ -1489,6 +1562,10 @@
- 				log_info ("bound: renewal in %ld %s.",
- 					  (long)(client -> active -> renewal -
- 						 cur_time), "seconds");
-+#ifdef ENABLE_POLLING_MODE
-+				/* Enable polling for this interface */
-+				client -> interface -> polling = 1;
-+#endif
- 				add_timeout (client -> active -> renewal,
- 					     state_bound, client, 0, 0);
- 			    } else {
-@@ -1496,6 +1573,11 @@
- 				log_info ("bound: immediate renewal.");
- 				state_bound (client);
- 			    }
-+			    /*
-+			     * Set the link status back to nolink, even
-+			     * if we have media settings.
-+			     */
-+                            client -> interface -> linkstate = NOLINK;
- 			    reinitialize_interfaces ();
- 			    go_daemon ();
- 			    return;
-@@ -1541,6 +1623,12 @@
- 	}
- 
- 	log_info ("No working leases in persistent database - sleeping.");
-+
-+#ifdef ENABLE_POLLING_MODE
-+	/* Enable polling for this interface */
-+	client -> interface -> polling = 1;
-+#endif
-+
- 	script_init (client, "FAIL", (struct string_list *)0);
- 	if (client -> alias)
- 		script_write_params (client, "alias_", client -> alias);
-@@ -1681,6 +1769,18 @@
- 			client -> packet.secs = htons (65535);
- 	}
- 
-+	/*
-+	 * Only try the first ten seconds to renew a lease from a
-+	 * given dhcp-server adress. After that, fall back to use
-+	 * state_reboot with INADDR_BROADCAST.
-+	 */
-+	if (destination.sin_addr.s_addr != INADDR_BROADCAST &&
-+	   (client -> state == S_RENEWING || client -> state == S_REBINDING)) {
-+		if (client -> active && client -> active -> expiry > cur_time &&
-+			interval >= 10)
-+			goto cancel;
-+	}
-+
- 	log_info ("DHCPREQUEST on %s to %s port %d",
- 	      client -> name ? client -> name : client -> interface -> name,
- 	      inet_ntoa (destination.sin_addr),
-@@ -1702,6 +1802,16 @@
- 				      from, &destination,
- 				      (struct hardware *)0);
- 
-+	/*
-+	 * If sendto() for a direct request fails, fall back to use
-+	 * state_reboot with INADDR_BROADCAST.
-+	 */
-+	if (result == -1 && destination.sin_addr.s_addr != INADDR_BROADCAST &&
-+	   (client -> state == S_RENEWING || client -> state == S_REBINDING)) {
-+		if (client -> active && client -> active -> expiry > cur_time)
-+			goto cancel;
-+	}
-+
- 	add_timeout (cur_time + client -> interval,
- 		     send_request, client, 0, 0);
- }
-@@ -2597,6 +2707,13 @@
- 			wstatus = 0;
- 		}
- 	} else {
-+		if ((i = open(_PATH_DEVNULL, O_RDWR)) != -1) {
-+			dup2(i, STDIN_FILENO);
-+			dup2(i, STDOUT_FILENO);
-+			dup2(i, STDERR_FILENO);
-+			if (i > STDERR_FILENO)
-+				close(i);
-+		}
- 		execve (scriptName, argv, envp);
- 		log_error ("execve (%s, ...): %m", scriptName);
- 		exit (0);
-@@ -2783,8 +2900,10 @@
- 			      case S_STOPPED:
- 				break;
- 			}
-+#ifndef ENABLE_POLLING_MODE
- 			client -> state = S_INIT;
- 			state_reboot (client);
-+#endif
- 		}
- 	}
- }
-@@ -3010,7 +3129,9 @@
- 		    break;
- 
- 		  case server_awaken:
-+#ifndef ENABLE_POLLING_MODE
- 		    state_reboot (client);
-+#endif
- 		    break;
- 		}
- 	    }
-@@ -3147,3 +3268,265 @@
- 	data_string_forget (&ddns_dhcid, MDL);
- 	return rcode;
- }
-+ 
-+/* Check to see if there's a wire plugged in */
-+int
-+interface_active(struct interface_info *ip) {
-+#if __FreeBSD_version > 502010
-+	struct ifmediareq ifmr;
-+	int *media_list, i;
-+	char *ifname;
-+	int sock;
-+ 
-+	ifname = ip -> name;
-+ 
-+	if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
-+		log_fatal ("Can't create interface_active socket");
-+ 
-+	(void) memset (&ifmr, 0, sizeof (ifmr));
-+	(void) strncpy (ifmr.ifm_name, ifname, sizeof (ifmr.ifm_name));
-+ 
-+	if (ioctl (sock, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
-+		/*
-+		 * Interface doesn't support SIOCGIFMEDIA, presume okay
-+		 */
-+		close (sock);
-+		return (HAVELINK);
-+	}
-+	close (sock);
-+ 
-+	if (ifmr.ifm_count == 0) {
-+		/*
-+		 * Assume that this means interface
-+		 * does not support SIOCGIFMEDIA
-+		 */
-+		log_fatal ("%s: no media types?", ifname);
-+		return (HAVELINK);
-+	}
-+ 
-+	if (ifmr.ifm_status & IFM_AVALID) {
-+		if (ip -> ieee80211) {
-+			/*
-+			 * Wavelan devices need to be checked if they are
-+			 * associated.
-+			 */
-+			if ((IFM_TYPE(ifmr.ifm_active) == IFM_IEEE80211) &&
-+			     (ifmr.ifm_status & IFM_ACTIVE)) {
-+				return (HAVELINK);
-+			}
-+		} else {
-+			if (ifmr.ifm_status & IFM_ACTIVE) {
-+				return (HAVELINK);
-+			}
-+		}
-+		/*
-+		 * We really have no link.
-+		 */
-+		return (NOLINK);
-+	}
-+	/*
-+	 * IFM_AVALID is not set. We cannot check
-+	 * the link state. Assume HAVELINK.
-+	 */
-+ 
-+#endif /* Other OSs */
-+	/*
-+	 * Always return a successful link if the OS
-+	 * is not supported.
-+	 */
-+	return (HAVELINK);
-+}
-+ 
-+#if __FreeBSD_version > 502010
-+void
-+set_ieee80211 (struct interface_info *ip) {
-+ 
-+	struct ieee80211req     ireq;
-+	u_int8_t                data[32];
-+	int                     associated = 0;
-+	int *media_list, i;
-+	char *ifname;
-+	int sock;
-+ 
-+	ifname = ip -> name;
-+ 
-+	if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
-+		log_fatal ("Can't create interface_active socket");
-+ 
-+	(void) memset (&ireq, 0, sizeof (ireq));
-+	(void) strncpy (ireq.i_name, ifname, sizeof (ireq.i_name));
-+	ireq.i_data = &data;
-+	ireq.i_type = IEEE80211_IOC_SSID;
-+	ireq.i_val = -1;
-+	/*
-+	 * If we can't get the SSID,
-+	 * this isn't an 802.11 device.
-+	 */
-+	if (ioctl (sock, SIOCG80211, &ireq) < 0)
-+		ip -> ieee80211 = 0;
-+	else {
-+#ifdef DEBUG
-+		printf ("Device %s has 802.11\n", ifname);
-+#endif
-+		ip -> ieee80211 = 1;
-+	}
-+	close (sock);
-+ }
-+#endif /* __FreeBSD_version */
-+ 
-+#ifdef ENABLE_POLLING_MODE
-+/* Go to background after some time */
-+void state_background (cpp)
-+	void *cpp;
-+{
-+	go_daemon ();
-+}
-+
-+/* Check the state of the NICs if we have link */
-+void state_polling (cpp)
-+	 void *cpp;
-+{
-+	static int doinitcheck = 0;
-+	struct interface_info *ip;
-+	struct client_state *client;
-+	int result;
-+ 
-+	for (ip = interfaces; ip; ip = ip -> next) {
-+		if (! ip -> polling)
-+			continue;
-+#ifdef DEBUG
-+		printf ("%s: Polling interface state\n", ip -> name);
-+		for (client = ip -> client;
-+		     client; client = client -> next) {
-+			printf ("%s: client state of %d\n", ip -> name, ip -> client -> state);
-+			printf ("%s: link = %d\n", ip -> name, ip -> linkstate);
-+		}
-+#endif
-+ 
-+		result = interface_active (ip);
-+		/*
-+		 * If dhclient.conf contains media settings, we cannot
-+		 * abort if the interface is not set to active mode.
-+		 */
-+		if (ip -> havemedia && ip -> client -> state != S_BOUND) {
-+			if (result == HAVELINK)
-+				ip -> forcediscover = 1;
-+			result = HAVELINK;
-+		}
-+ 
-+		/*
-+		 * The last status of the interface tells us
-+		 * the we've got no link ...
-+		 */
-+		if (ip -> linkstate == NOLINK || ! doinitcheck) {
-+			/*
-+			 * ... but we have now link. Let's send
-+			 * requests.
-+			 */
-+			if (result == HAVELINK) {
-+#ifdef DEBUG
-+				if (ip -> havemedia)
-+					printf ("%s: Trying media settings on interface\n",
-+						ip -> name);
-+				else
-+					printf ("%s: Found Link on interface\n", ip -> name);
-+#endif
-+				/*
-+				 * Set the interface to state_bound. We assume that we have
-+				 * a working link. If we cannot reach the server directly,
-+				 * INADDR_BROADCAST is used.
-+				 */
-+				for (client = ip -> client;
-+				     client; client = client -> next) {
-+					cancel_timeout (state_init, client);
-+					cancel_timeout (state_reboot, client);
-+					cancel_timeout (state_selecting, client);
-+					if (client -> active) {
-+						add_timeout (cur_time + random () % 5,
-+						   state_bound, client, 0, 0);
-+					} else {
-+						add_timeout (cur_time + random () % 5,
-+						   state_reboot, client, 0, 0);
-+					}
-+				}
-+				ip -> linkstate = HAVELINK;
-+			} else {
-+#ifdef DEBUG
-+				printf ("%s: No link on interface\n", ip -> name);
-+#endif
-+				for (client = ip -> client;
-+				     client; client = client -> next) {
-+					/*
-+					 * Without this add_timout(), dhclient does
-+					 * not poll on a interface if there
-+					 * is no cable plugged in at startup
-+					 * time. Because we add one additional second
-+					 * to the time of a normal timeout, we always
-+					 * skip and block a running one. This prevents
-+					 * that polling is done twice at the same time.
-+					 */
-+					if (client -> state == S_INIT) {
-+						add_timeout (cur_time + (polling_interval + 1),
-+							     state_polling, client, 0, 0);
-+					}
-+				}
-+				ip -> linkstate = NOLINK;
-+				/*
-+				 * Automatically go into the background after
-+				 * some time. Do this only if there are no
-+				 * media options available for a interface.
-+				 */
-+				if (! ip -> havemedia && ! doinitcheck) {
-+					add_timeout (cur_time + (polling_interval * 2),
-+						    state_background, client, 0, 0);
-+				}
-+			}
-+		}
-+ 
-+		/*
-+		 * The last status of the interface tells us
-+		 * the we previously had link.
-+		 */
-+		if (ip -> linkstate == HAVELINK && doinitcheck) {
-+			if (result == NOLINK) {
-+				/*
-+				 * We lost link on the interface, or it isn't
-+				 * associated anymore.
-+				 */
-+#ifdef DEBUG
-+				printf ("%s: Lost Link on interface\n", ip -> name);
-+#endif
-+				/*
-+				 * After we lost link, cycle again through the
-+				 * different media settings if available. Else
-+				 * set NOLINK.
-+				 */
-+				if (ip -> havemedia)
-+					ip -> forcediscover = 1;
-+				else
-+					ip -> linkstate = NOLINK;
-+			}
-+			/*
-+			 * If we happen to have a real link, but no
-+			 * active lease, force the interface into
-+			 * state_reboot. Do the same if media settings
-+			 * are available.
-+			 */
-+			if (ip -> forcediscover) {
-+				for (client = ip -> client;
-+				     client; client = client -> next) {
-+					if (client -> state != S_REBOOTING &&
-+					    client -> state != S_SELECTING) {
-+						add_timeout (cur_time + random () % 5,
-+							    state_reboot, client, 0, 0);
-+					}
-+				}
-+				ip -> forcediscover = 0;
-+				ip -> linkstate = HAVELINK;
-+			}
-+			/* We still have link, do nothing. */
-+		}
-+	}
-+	doinitcheck = 1;
-+}
-+#endif /* ifdef ENABLE_POLLING_MODE */
diff --git a/net/isc-dhcp40-server/files/patch-client::dhclient.conf b/net/isc-dhcp40-server/files/patch-client::dhclient.conf
deleted file mode 100644
index 2d9560f43bf8..000000000000
--- a/net/isc-dhcp40-server/files/patch-client::dhclient.conf
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/dhclient.conf.orig	Tue Jun  3 00:50:44 1997
-+++ client/dhclient.conf	Wed Mar  3 02:20:41 2004
-@@ -11,7 +11,7 @@
- reboot 10;
- select-timeout 5;
- initial-interval 2;
--script "/etc/dhclient-script";
-+script "%%PREFIX%%/sbin/dhclient-script";
- media "-link0 -link1 -link2", "link0 link1";
- reject 192.33.137.209;
- 
diff --git a/net/isc-dhcp40-server/files/patch-common::dhcp-options.5 b/net/isc-dhcp40-server/files/patch-common::dhcp-options.5
deleted file mode 100644
index 9d936cfffeee..000000000000
--- a/net/isc-dhcp40-server/files/patch-common::dhcp-options.5
+++ /dev/null
@@ -1,32 +0,0 @@
---- common/dhcp-options.5.orig	Sun Feb 23 04:27:42 2003
-+++ common/dhcp-options.5	Wed Mar  3 02:12:13 2004
-@@ -431,7 +431,10 @@
- the domain-name option to specify the domain name).  See RFC 1035 for
- character set restrictions.  This option is only honored by
- .B dhclient-script(8)
--if the hostname for the client machine is not set.
-+if the hostname for the client machine is not set (i.e., set to the empty
-+string in
-+.B rc.conf(5)
-+).
- .RE
- .PP
- .B option \fBieee802-3-encapsulation\fR \fIflag\fR\fB;\fR
-@@ -654,7 +657,7 @@
- This option specifies whether the client should configure its IP
- layer to allow forwarding of datagrams with non-local source routes
- (see Section 3.3.5 of [4] for a discussion of this topic).  A value
--of false means disallow forwarding of such datagrams, and a value of true
-+of 0 means disallow forwarding of such datagrams, and a value of true
- means allow forwarding.
- .RE
- .PP
-@@ -948,7 +951,7 @@
- .PP
- This option specifies whether or not the client should negotiate the
- use of trailers (RFC 893 [14]) when using the ARP protocol.  A value
--of false indicates that the client should not attempt to use trailers.  A
-+of 0 indicates that the client should not attempt to use trailers.  A
- value of true means that the client should attempt to use trailers.
- .RE
- .PP
diff --git a/net/isc-dhcp40-server/files/patch-common::discover.c b/net/isc-dhcp40-server/files/patch-common::discover.c
deleted file mode 100644
index 1cfcc2094098..000000000000
--- a/net/isc-dhcp40-server/files/patch-common::discover.c
+++ /dev/null
@@ -1,238 +0,0 @@
---- common/discover.c.orig	Fri Jul 25 21:44:15 2003
-+++ common/discover.c	Fri Mar  5 23:33:04 2004
-@@ -47,6 +47,7 @@
- #endif /* not lint */
- 
- #include "dhcpd.h"
-+#include <ifaddrs.h>
- #include <sys/ioctl.h>
- 
- struct interface_info *interfaces, *dummy_interfaces, *fallback_interface;
-@@ -135,10 +136,7 @@
- {
- 	struct interface_info *tmp, *ip;
- 	struct interface_info *last, *next;
--	char buf [2048];
--	struct ifconf ic;
--	struct ifreq ifr;
--	int i;
-+	struct ifaddrs *ifap, *ifa;
- 	int sock;
- 	int address_count = 0;
- 	struct subnet *subnet;
-@@ -157,61 +155,6 @@
- 	if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
- 		log_fatal ("Can't create addrlist socket");
- 
--	/* Get the interface configuration information... */
--
--#ifdef SIOCGIFCONF_ZERO_PROBE
--	/* linux will only tell us how long a buffer it wants if we give it
--	 * a null buffer first. So, do a dry run to figure out the length.
--	 * 
--	 * XXX this code is duplicated from below because trying to fold
--	 * the logic into the if statement and goto resulted in excesssive
--	 * obfuscation. The intent is that unless you run Linux you shouldn't
--	 * have to deal with this. */
--
--	ic.ifc_len = 0;
--	ic.ifc_ifcu.ifcu_buf = (caddr_t)NULL;
--#else
--	/* otherwise, we just feed it a starting size, and it'll tell us if
--	 * it needs more */
--
--	ic.ifc_len = sizeof buf;
--	ic.ifc_ifcu.ifcu_buf = (caddr_t)buf;
--#endif
--
--      gifconf_again:
--	i = ioctl(sock, SIOCGIFCONF, &ic);
--
--	if (i < 0)
--		log_fatal ("ioctl: SIOCGIFCONF: %m");
--
--#ifdef SIOCGIFCONF_ZERO_PROBE
--	/* Workaround for SIOCGIFCONF bug on some Linux versions. */
--	if (ic.ifc_ifcu.ifcu_buf == 0 && ic.ifc_len == 0) {
--		ic.ifc_len = sizeof buf;
--		ic.ifc_ifcu.ifcu_buf = (caddr_t)buf;
--		goto gifconf_again;
--	}
--#endif
--
--	/* If the SIOCGIFCONF resulted in more data than would fit in
--	   a buffer, allocate a bigger buffer. */
--	if ((ic.ifc_ifcu.ifcu_buf == buf 
--#ifdef SIOCGIFCONF_ZERO_PROBE
--	     || ic.ifc_ifcu.ifcu_buf == 0
--#endif
--		) && ic.ifc_len > sizeof buf) {
--		ic.ifc_ifcu.ifcu_buf = dmalloc ((size_t)ic.ifc_len, MDL);
--		if (!ic.ifc_ifcu.ifcu_buf)
--			log_fatal ("Can't allocate SIOCGIFCONF buffer.");
--		goto gifconf_again;
--#ifdef SIOCGIFCONF_ZERO_PROBE
--	} else if (ic.ifc_ifcu.ifcu_buf == 0) {
--		ic.ifc_ifcu.ifcu_buf = (caddr_t)buf;
--		ic.ifc_len = sizeof buf;
--		goto gifconf_again;
--#endif
--	}
--
- 		
- 	/* If we already have a list of interfaces, and we're running as
- 	   a DHCP server, the interfaces were requested. */
-@@ -224,51 +167,38 @@
- 	else
- 		ir = INTERFACE_REQUESTED;
- 
-+	if (getifaddrs(&ifap) != 0)
-+		log_fatal ("getifaddrs failed");
-+
- 	/* Cycle through the list of interfaces looking for IP addresses. */
--	for (i = 0; i < ic.ifc_len;) {
--		struct ifreq *ifp = (struct ifreq *)((caddr_t)ic.ifc_req + i);
--#ifdef HAVE_SA_LEN
--		if (ifp -> ifr_addr.sa_len > sizeof (struct sockaddr))
--			i += (sizeof ifp -> ifr_name) + ifp -> ifr_addr.sa_len;
--		else
--#endif
--			i += sizeof *ifp;
-+	for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
- 
- #ifdef ALIAS_NAMES_PERMUTED
--		if ((s = strrchr (ifp -> ifr_name, ':'))) {
-+		if ((s = strrchr (ifa -> ifa_name, ':'))) {
- 			*s = 0;
- 		}
- #endif
- 
- #ifdef SKIP_DUMMY_INTERFACES
--		if (!strncmp (ifp -> ifr_name, "dummy", 5))
-+		if (!strncmp (ifa -> ifa_name, "dummy", 5))
- 			continue;
- #endif
- 
--
--		/* See if this is the sort of interface we want to
--		   deal with. */
--		strcpy (ifr.ifr_name, ifp -> ifr_name);
--		if (ioctl (sock, SIOCGIFFLAGS, &ifr) < 0)
--			log_fatal ("Can't get interface flags for %s: %m",
--			       ifr.ifr_name);
--
- 		/* See if we've seen an interface that matches this one. */
- 		for (tmp = interfaces; tmp; tmp = tmp -> next)
--			if (!strcmp (tmp -> name, ifp -> ifr_name))
-+			if (!strcmp (tmp -> name, ifa -> ifa_name))
- 				break;
- 
--		/* Skip non broadcast interfaces (plus loopback and
--		   point-to-point in case an OS incorrectly marks them
--		   as broadcast). Also skip down interfaces unless we're
-+		/* See if this is the sort of interface we want to
-+		   deal with.  Skip loopback, point-to-point and down
-+		   interfaces, except don't skip down interfaces if we're
- 		   trying to get a list of configurable interfaces. */
--		if (((!(ifr.ifr_flags & IFF_BROADCAST) ||
--		      ifr.ifr_flags & IFF_LOOPBACK ||
--		      ifr.ifr_flags & IFF_POINTOPOINT) && !tmp) ||
--		    (!(ifr.ifr_flags & IFF_UP) &&
-+		if ((ifa->ifa_flags & IFF_LOOPBACK) ||
-+		     (ifa->ifa_flags & IFF_POINTOPOINT) ||
-+		     (!(ifa->ifa_flags & IFF_UP) &&
- 		     state != DISCOVER_UNCONFIGURED))
- 			continue;
--		
-+
- 		/* If there isn't already an interface by this name,
- 		   allocate one. */
- 		if (!tmp) {
-@@ -276,9 +206,9 @@
- 			status = interface_allocate (&tmp, MDL);
- 			if (status != ISC_R_SUCCESS)
- 				log_fatal ("Error allocating interface %s: %s",
--					   ifp -> ifr_name,
-+					   ifa -> ifa_name,
- 					   isc_result_totext (status));
--			strcpy (tmp -> name, ifp -> ifr_name);
-+			strcpy (tmp -> name, ifa -> ifa_name);
- 			interface_snorf (tmp, ir);
- 			interface_dereference (&tmp, MDL);
- 			tmp = interfaces; /* XXX */
-@@ -290,9 +220,9 @@
- 		/* If we have the capability, extract link information
- 		   and record it in a linked list. */
- #ifdef HAVE_AF_LINK
--		if (ifp -> ifr_addr.sa_family == AF_LINK) {
-+		if (ifa -> ifa_addr->sa_family == AF_LINK) {
- 			struct sockaddr_dl *foo = ((struct sockaddr_dl *)
--						   (&ifp -> ifr_addr));
-+						   (ifa -> ifa_addr));
- #if defined (HAVE_SIN_LEN)
- 			tmp -> hw_address.hlen = foo -> sdl_alen;
- #else
-@@ -305,12 +235,11 @@
- 		} else
- #endif /* AF_LINK */
- 
--		if (ifp -> ifr_addr.sa_family == AF_INET) {
-+		if (ifa -> ifa_addr->sa_family == AF_INET) {
- 			struct iaddr addr;
- 
- 			/* Get a pointer to the address... */
--			memcpy (&foo, &ifp -> ifr_addr,
--				sizeof ifp -> ifr_addr);
-+			bcopy(ifa->ifa_addr, &foo, sizeof(foo));
- 
- 			/* We don't want the loopback interface. */
- 			if (foo.sin_addr.s_addr == htonl (INADDR_LOOPBACK) &&
-@@ -323,16 +252,15 @@
- 			   found, keep a pointer to ifreq structure in
- 			   which we found it. */
- 			if (!tmp -> ifp) {
--#ifdef HAVE_SA_LEN
--				unsigned len = ((sizeof ifp -> ifr_name) +
--						ifp -> ifr_addr.sa_len);
--#else
--				unsigned len = sizeof *ifp;
--#endif
-+
-+				int len = (IFNAMSIZ +
-+					ifa -> ifa_addr->sa_len);
- 				tif = (struct ifreq *)dmalloc (len, MDL);
- 				if (!tif)
- 					log_fatal ("no space for ifp.");
--				memcpy (tif, ifp, len);
-+				strlcpy(tif->ifr_name, ifa->ifa_name, IFNAMSIZ);
-+				memcpy(&tif->ifr_addr, ifa->ifa_addr,
-+					ifa->ifa_addr->sa_len);
- 				tmp -> ifp = tif;
- 				tmp -> primary_address = foo.sin_addr;
- 			}
-@@ -346,9 +274,6 @@
- 		}
- 	}
- 
--	/* If we allocated a buffer, free it. */
--	if (ic.ifc_ifcu.ifcu_buf != buf)
--		dfree (ic.ifc_ifcu.ifcu_buf, MDL);
- 
- #if defined (LINUX_SLASHPROC_DISCOVERY)
- 	/* On Linux, interfaces that don't have IP addresses don't
-@@ -529,6 +454,7 @@
- 	   be able to configure, we can quit now. */
- 	if (state == DISCOVER_UNCONFIGURED) {
- 		close (sock);
-+		freeifaddrs(ifap);
- 		return;
- 	}
- 
-@@ -674,6 +600,7 @@
- 	}
- 
- 	close (sock);
-+	freeifaddrs(ifap);
- 
- 	if (state == DISCOVER_SERVER && wifcount == 0) {
- 		log_info ("%s", "");
diff --git a/net/isc-dhcp40-server/files/patch-common::dispatch.c b/net/isc-dhcp40-server/files/patch-common::dispatch.c
deleted file mode 100644
index 0aa709cf0860..000000000000
--- a/net/isc-dhcp40-server/files/patch-common::dispatch.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- common/dispatch.c.orig	Sun Nov 17 03:26:57 2002
-+++ common/dispatch.c	Wed Mar  3 16:20:15 2004
-@@ -95,11 +95,26 @@
- void dispatch ()
- {
- 	struct timeval tv, *tvp;
-+#ifdef ENABLE_POLLING_MODE
-+	struct timeval *tvp_new;
-+#endif
- 	isc_result_t status;
-+	TIME cur_time;
- 
-+	tvp = NULL;
-+#ifdef ENABLE_POLLING_MODE
-+	tvp_new = NULL;
-+#endif
- 	/* Wait for a packet or a timeout... XXX */
- 	do {
- 		tvp = process_outstanding_timeouts (&tv);
-+#ifdef ENABLE_POLLING_MODE
-+		GET_TIME (&cur_time);
-+		add_timeout(cur_time + polling_interval, state_polling, 0, 0, 0);
-+		tvp_new = process_outstanding_timeouts(&tv);
-+		if (tvp != NULL && (tvp -> tv_sec > tvp_new -> tv_sec))
-+			tvp = tvp_new;
-+#endif /* ENABLE_POLLING_MODE */
- 		status = omapi_one_dispatch (0, tvp);
- 	} while (status == ISC_R_TIMEDOUT || status == ISC_R_SUCCESS);
- 	log_fatal ("omapi_one_dispatch failed: %s -- exiting.",
diff --git a/net/isc-dhcp40-server/files/patch-common::parse.c b/net/isc-dhcp40-server/files/patch-common::parse.c
deleted file mode 100644
index 637d69e7f41b..000000000000
--- a/net/isc-dhcp40-server/files/patch-common::parse.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- common/parse.c.orig	2 Sep 2003 11:01:23 -0000
-+++ common/parse.c	22 Feb 2004 10:44:52 -0000
-@@ -414,6 +414,7 @@
- {
- 	const char *val;
- 	enum dhcp_token token;
-+	int32_t num;
- 
- 	token = next_token (&val, (unsigned *)0, cfile);
- 	if (token != NUMBER) {
-@@ -421,9 +422,9 @@
- 		skip_to_semi (cfile);
- 		return;
- 	}
--	convert_num (cfile, (unsigned char *)timep, val, 10, 32);
-+	convert_num (cfile, (unsigned char *)&num, val, 10, 32);
- 	/* Unswap the number - convert_num returns stuff in NBO. */
--	*timep = ntohl (*timep); /* XXX */
-+	*timep = ntohl (num);
- 
- 	parse_semi (cfile);
- }
diff --git a/net/isc-dhcp40-server/files/patch-configure b/net/isc-dhcp40-server/files/patch-configure
deleted file mode 100644
index 5aff6909acce..000000000000
--- a/net/isc-dhcp40-server/files/patch-configure
+++ /dev/null
@@ -1,41 +0,0 @@
---- configure.orig	Sat Apr 20 23:44:13 2002
-+++ configure	Mon Apr 28 23:02:10 2003
-@@ -13,6 +13,9 @@
-   elif [ x$1 = x--dirs ]; then
-     dirs=$2
-     shift
-+  elif [ x$1 = x--subsys ]; then
-+    subsys=$2
-+    shift
-   elif [ x$1 = x--no-links ]; then
-     nolinks=YES
-   elif [ x$1 = x--copts ]; then
-@@ -233,7 +236,14 @@
- fi
- 
- if [ x"$dirs" = x ]; then
--  dirs=". client server relay common omapip dhcpctl minires dst"
-+  dirs=". common minires dst omapip dhcpctl"
-+  if [ x$subsys = x ]; then
-+    dirs="$dirs server omshell client relay"
-+  elif [ x$subsys = xserver ]; then
-+    dirs="$dirs server omshell"
-+  elif [ x$subsys = xclient -o x$subsys = xrelay ]; then
-+    dirs="$dirs $subsys"
-+  fi
- fi
- 
- for foo in $dirs; do
-@@ -253,7 +263,11 @@
- 
- # Make the link tree in which to actually build.
- if [ x$nolinks = x ]; then
--  make links
-+  if [ x$subsys = x ]; then
-+    make links
-+  else
-+    make links.$subsys
-+  fi
- fi
- 
- exit 0
diff --git a/net/isc-dhcp40-server/files/patch-dhcpctl::Makefile.dist b/net/isc-dhcp40-server/files/patch-dhcpctl::Makefile.dist
deleted file mode 100644
index acfee5854413..000000000000
--- a/net/isc-dhcp40-server/files/patch-dhcpctl::Makefile.dist
+++ /dev/null
@@ -1,79 +0,0 @@
---- dhcpctl/Makefile.dist.orig	Mon Apr 28 16:31:57 2003
-+++ dhcpctl/Makefile.dist	Mon Apr 28 16:24:20 2003
-@@ -17,11 +17,11 @@
- # http://www.isc.org for more information.
- #
- 
--CATMANPAGES = dhcpctl.cat3 omshell.cat1
--SEDMANPAGES = dhcpctl.man3 omshell.man1
-+CATMANPAGES = dhcpctl.cat3
-+SEDMANPAGES = dhcpctl.man3
- SRC    = dhcpctl.c callback.c remote.c
- OBJ    = dhcpctl.o callback.o remote.o
--MAN    = dhcpctl.3 omshell.1
-+MAN    = dhcpctl.3
- HDRS   = dhcpctl.h
- 
- INCLUDES = $(BINDINC) -I$(TOP)/includes
-@@ -29,10 +29,7 @@
- DHCPCTLLIBS = libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \
- 		../omapip/libomapi.a ../dst/libdst.a
- 
--all:	libdhcpctl.a omshell cltest $(CATMANPAGES)
--
--omshell:	omshell.o $(DHCPCTLLIBS)
--	$(CC) $(DEBUG) $(LFLAGS) -o omshell omshell.o $(DHCPCTLLIBS) $(LIBS)
-+all:	libdhcpctl.a cltest $(CATMANPAGES)
- 
- cltest:	cltest.o $(DHCPCTLLIBS)
- 	$(CC) $(DEBUG) $(LFLAGS) -o cltest cltest.o $(DHCPCTLLIBS) $(LIBS)
-@@ -43,8 +40,7 @@
- 	$(RANLIB) libdhcpctl.a
- 
- install: all $(CATMANPAGES)
--	for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR) $(USRMANDIR) \
--		$(USERBINDIR); do \
-+	for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR); do \
- 	  foo=""; \
- 	  for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
- 	    foo=$${foo}/$$bar; \
-@@ -64,16 +60,12 @@
- 	  $(MANINSTALL) $(MANFROM) $${prefix}.$(MANCAT)$${suffix} $(MANTO) \
- 			$(DESTDIR)$(LIBMANDIR)/$${prefix}$(LIBMANEXT); \
- 	done
--	$(INSTALL) omshell $(DESTDIR)$(USERBINDIR)
--	$(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell
--	$(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \
--				$(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT)
- 
- depend:
- 	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC)
- 
- clean:
--	-rm -f $(OBJ) test.o svtest cltest.o cltest
-+	-rm -f $(OBJ) cltest.o cltest
- 
- realclean: clean
- 	-rm -f libdhcpctl.a *~ $(CATMANPAGES) $(SEDMANPAGES)
-@@ -82,7 +74,7 @@
- 	-rm -f Makefile
- 
- links:
--	@for foo in $(SRC) $(MAN) omshell.c cltest.c $(HDRS); do \
-+	@for foo in $(SRC) $(MAN) cltest.c $(HDRS); do \
- 	  if [ ! -b $$foo ]; then \
- 	    rm -f $$foo; \
- 	  fi; \
-@@ -95,12 +87,5 @@
- dhcpctl.man3:	dhcpctl.3
- 	sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
- 		-e "s#RUNDIR#$(VARRUN)#g" < dhcpctl.3 >dhcpctl.man3
--
--omshell.cat1:	omshell.man1
--	nroff -man omshell.man1 >omshell.cat1
--
--omshell.man1:	omshell.1
--	sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
--		-e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1
- 
- # Dependencies (semi-automatically-generated)
diff --git a/net/isc-dhcp40-server/files/patch-dhcpd.conf b/net/isc-dhcp40-server/files/patch-dhcpd.conf
deleted file mode 100644
index 030e89874d8d..000000000000
--- a/net/isc-dhcp40-server/files/patch-dhcpd.conf
+++ /dev/null
@@ -1,12 +0,0 @@
---- server/dhcpd.conf.orig	Thu Jan 25 03:33:11 2001
-+++ server/dhcpd.conf	Wed Jan 30 22:06:52 2002
-@@ -14,6 +14,9 @@
- # network, the authoritative directive should be uncommented.
- #authoritative;
- 
-+# ad-hoc DNS update scheme - set to "none" to disable dynamic DNS updates.
-+ddns-update-style ad-hoc;
-+
- # Use this to send dhcp log messages to a different log file (you also
- # have to hack syslog.conf to complete the redirection).
- log-facility local7;
diff --git a/net/isc-dhcp40-server/files/patch-dst::Makefile.dist b/net/isc-dhcp40-server/files/patch-dst::Makefile.dist
deleted file mode 100644
index ad45436b1629..000000000000
--- a/net/isc-dhcp40-server/files/patch-dst::Makefile.dist
+++ /dev/null
@@ -1,29 +0,0 @@
---- dst/Makefile.dist.orig	Sun Nov 17 03:27:43 2002
-+++ dst/Makefile.dist	Fri Mar  5 23:40:45 2004
-@@ -26,12 +26,24 @@
- 
- all:	libdst.a
- 
--install:
--
- libdst.a:	$(OBJ)
- 	rm -f dst.a
- 	ar cruv libdst.a $(OBJ)
- 	$(RANLIB) libdst.a
-+
-+install: all
-+	for dir in $(LIBDIR);\
-+	 do \
-+	  foo=""; \
-+	  for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
-+	    foo=$${foo}/$$bar; \
-+	    if [ ! -d $$foo ]; then \
-+	      mkdir $$foo; \
-+	      chmod 755 $$foo; \
-+	    fi; \
-+	  done; \
-+	done
-+	$(INSTALL) libdst.a $(DESTDIR)$(LIBDIR)
- 
- depend:
- 	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC)
diff --git a/net/isc-dhcp40-server/files/patch-freebsd b/net/isc-dhcp40-server/files/patch-freebsd
deleted file mode 100644
index 9fef4fdab877..000000000000
--- a/net/isc-dhcp40-server/files/patch-freebsd
+++ /dev/null
@@ -1,75 +0,0 @@
---- client/scripts/freebsd.orig	Sun Apr 27 21:44:01 2003
-+++ client/scripts/freebsd	Wed Mar  3 02:28:29 2004
-@@ -16,7 +16,7 @@
-       ( echo search $new_domain_name >/etc/resolv.conf )
-       exit_status=$?
-     else
--      rm /etc/resolv.conf
-+      ( rm /etc/resolv.conf )
-       exit_status=$?
-     fi
-     if [ $exit_status -ne 0 ]; then
-@@ -32,17 +32,17 @@
- # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
- exit_with_hooks() {
-   exit_status=$1
--  if [ -f /etc/dhclient-exit-hooks ]; then
--    . /etc/dhclient-exit-hooks
-+  if [ -f %%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 [ -f /etc/dhclient-enter-hooks ]; then
-+if [ -f %%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
-@@ -51,11 +51,11 @@
- fi
- 
- if [ x$new_network_number != x ]; then
--   $LOGGER New Network Number: $new_network_number
-+  $LOGGER "New Network Number: $new_network_number"
- fi
- 
- if [ x$new_broadcast_address != x ]; then
-- $LOGGER New Broadcast Address: $new_broadcast_address
-+  $LOGGER "New Broadcast Address: $new_broadcast_address"
-   new_broadcast_arg="broadcast $new_broadcast_address"
- fi
- if [ x$old_broadcast_address != x ]; then
-@@ -71,6 +71,15 @@
-   alias_subnet_arg="netmask $alias_subnet_mask"
- fi
- 
-+# Get the interface to which our default route is bound to.
-+if [ -x /usr/bin/netstat ]; then
-+	if_defaultroute=`/usr/bin/netstat -rn \
-+		| /usr/bin/grep "^default" \
-+		| /usr/bin/awk '{print $6}'`
-+else
-+	if_defaultroute=""
-+fi
-+
- if [ x$reason = xMEDIUM ]; then
-   eval "ifconfig $interface $medium"
-   eval "ifconfig $interface inet -alias 0.0.0.0 $medium" >/dev/null 2>&1
-@@ -113,7 +122,10 @@
-     eval "ifconfig $interface inet -alias $old_ip_address $medium"
-     route delete $old_ip_address 127.1 >/dev/null 2>&1
-     for router in $old_routers; do
--      route delete default $router >/dev/null 2>&1
-+	if [ x$if_defaultroute = x ] || [ x$if_defaultroute = x$interface ]
-+	 then
-+	      route delete default $router >/dev/null 2>&1
-+	fi
-     done
-     if [ -n "$old_static_routes" ]; then
-       set -- $old_static_routes
diff --git a/net/isc-dhcp40-server/files/patch-includes::cf::freebsd.h b/net/isc-dhcp40-server/files/patch-includes::cf::freebsd.h
deleted file mode 100644
index 9a3f4c636b09..000000000000
--- a/net/isc-dhcp40-server/files/patch-includes::cf::freebsd.h
+++ /dev/null
@@ -1,62 +0,0 @@
---- includes/cf/freebsd.h.orig	Wed Mar  3 02:32:39 2004
-+++ includes/cf/freebsd.h	Wed Mar  3 02:31:56 2004
-@@ -42,7 +42,7 @@
-  */
- 
- #include <syslog.h>
--#include <sys/types.h>
-+#include <sys/param.h>
- #include <string.h>
- #include <paths.h>
- #include <errno.h>
-@@ -101,6 +101,10 @@
- #define SOCKLEN_T int
- #endif
- 
-+#ifdef RESCUE
-+#define _PATH_DHCLIENT_SCRIPT	"/rescue/dhclient-script"
-+#endif
-+
- #if defined (USE_DEFAULT_NETWORK)
- #  define USE_BPF
- #endif
-@@ -111,6 +115,9 @@
-  #endif /* HAVE_DEV_RANDOM */
- 
- const char *cmds[] = {
-+#ifndef RESCUE
-+	/* rescue environment can't rely on these ... */
-+	/* Actually, /sbin/dhclient shouldn't use these, either. */
- 	"/bin/ps -axlw 2>&1",
- 	"/usr/sbin/arp -an 2>&1",
- 	"/usr/bin/netstat -an 2>&1",
-@@ -121,10 +128,12 @@
- 	"/usr/sbin/iostat  2>&1",
- 	"/usr/bin/vmstat  2>&1",
- 	"/usr/bin/w  2>&1",
-+#endif
- 	NULL
- };
- 
- const char *dirs[] = {
-+#ifndef RESCUE
- 	"/tmp",
- 	"/usr/tmp",
- 	".",
-@@ -134,13 +143,16 @@
- 	"/var/mail",
- 	"/home",
- 	"/usr/home",
-+#endif
- 	NULL
- };
- 
- const char *files[] = {
-+#ifndef RESCUE
- 	"/var/log/messages",
- 	"/var/log/wtmp",
- 	"/var/log/lastlog",
-+#endif
- 	NULL
- };
- #endif /* NEED_PRAND_CONF */
diff --git a/net/isc-dhcp40-server/files/patch-includes::dhcpd.h b/net/isc-dhcp40-server/files/patch-includes::dhcpd.h
deleted file mode 100644
index 1933e0b4037a..000000000000
--- a/net/isc-dhcp40-server/files/patch-includes::dhcpd.h
+++ /dev/null
@@ -1,56 +0,0 @@
---- includes/dhcpd.h.orig	Mon Feb 10 02:22:46 2003
-+++ includes/dhcpd.h	Wed Mar  3 16:20:09 2004
-@@ -99,6 +99,9 @@
- 	 (((x) >> OPTION_HASH_EXP) & \
- 	  (OPTION_HASH_PTWO - 1))) % OPTION_HASH_SIZE;
- 
-+#define NOLINK 0
-+#define HAVELINK 1
-+
- enum dhcp_shutdown_state {
- 	shutdown_listeners,
- 	shutdown_omapi_connections,
-@@ -783,6 +786,11 @@
- 	unsigned remote_id_len;		/* Length of Remote ID. */
- 
- 	char name [IFNAMSIZ];		/* Its name... */
-+	int ieee80211;                  /* True if media is ieee802.11 */
-+	int havemedia;                  /* True if we have a media table */
-+	int linkstate;                  /* True if we have link */
-+	int polling;                    /* True if polling is enabled */
-+	int forcediscover;              /* True if a discover is needed */
- 	int index;			/* Its index. */
- 	int rfdesc;			/* Its read file descriptor. */
- 	int wfdesc;			/* Its write file descriptor, if
-@@ -1845,6 +1853,9 @@
- extern const char *path_dhclient_pid;
- extern char *path_dhclient_script;
- extern int interfaces_requested;
-+#ifdef ENABLE_POLLING_MODE
-+extern int polling_interval;
-+#endif
- 
- extern struct client_config top_level_config;
- 
-@@ -1858,12 +1869,21 @@
- void send_decline PROTO ((void *));
- 
- void state_reboot PROTO ((void *));
-+#ifdef ENABLE_POLLING_MODE
-+void state_background PROTO ((void *));
-+void state_polling PROTO ((void *));
-+#endif
- void state_init PROTO ((void *));
- void state_selecting PROTO ((void *));
- void state_requesting PROTO ((void *));
- void state_bound PROTO ((void *));
- void state_stop PROTO ((void *));
- void state_panic PROTO ((void *));
-+
-+#if __FreeBSD_version > 502010
-+void set_ieee80211 PROTO ((struct interface_info *));
-+#endif
-+int interface_active PROTO ((struct interface_info *));
- 
- void bind_lease PROTO ((struct client_state *));
- 
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 1149e0c7925c..000000000000
--- a/net/isc-dhcp40-server/files/patch-site.conf
+++ /dev/null
@@ -1,42 +0,0 @@
---- site.conf.orig	Wed Jul  7 17:20:10 1999
-+++ site.conf	Wed Mar  3 14:00:14 2004
-@@ -1,2 +1,39 @@
- # Put local site configuration stuff here to override the default
- # settings in Makefile.conf
-+
-+PREFIX ?=	/usr/local
-+
-+USERBINDIR =	$(PREFIX)/bin
-+BINDIR =	$(PREFIX)/sbin
-+CLIENTBINDIR =	$(PREFIX)/sbin
-+ADMMANDIR =	$(PREFIX)/man/man8
-+ADMMANEXT =	.8
-+FFMANDIR =	$(PREFIX)/man/man5
-+FFMANEXT =	.5
-+LIBMANDIR =	$(PREFIX)/man/man3
-+LIBMANEXT =	.3
-+USRMANDIR =	$(PREFIX)/man/man1
-+USRMANEXT =	.1
-+MANCAT =	man
-+# INSTALL =	${INSTALL_DATA}
-+# MANINSTALL =	${INSTALL_MAN}
-+ETC =		$(PREFIX)/etc
-+LIBDIR =	${PREFIX}/lib
-+INCDIR =	${PREFIX}/include
-+CLIENT_PATH =	\"PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin\"
-+
-+DEBUG ?=	#none
-+
-+CFLAGS +=	-D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\"
-+CFLAGS +=	-D_PATH_DHCPD_DB=\"$(VARDB)/dhcpd.leases\"
-+CFLAGS +=	-D_PATH_DHCPD_PID=\"$(VARRUN)/dhcpd.pid\"
-+
-+CFLAGS +=	-D_PATH_DHCRELAY_PID=\"$(VARRUN)/dhcrelay.pid\"
-+
-+CFLAGS +=	-D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\"
-+CFLAGS +=	-D_PATH_DHCLIENT_SCRIPT=\"$(CLIENTBINDIR)/dhclient-script\"
-+CFLAGS +=	-D_PATH_DHCLIENT_DB=\"$(VARDB)/dhclient.leases\"
-+CFLAGS +=	-D_PATH_DHCLIENT_PID=\"$(VARRUN)/dhclient.pid\"
-+
-+CFLAGS +=	-Dwarn=dhcp_warn
-+CFLAGS +=	-DNOMINUM
diff --git a/net/isc-dhcp40-server/pkg-descr b/net/isc-dhcp40-server/pkg-descr
deleted file mode 100644
index 86bbb3cc62f0..000000000000
--- a/net/isc-dhcp40-server/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides a
-freely redistributable reference implementation of all aspects of the
-DHCP protocol, through a suite of DHCP tools:
-
-  * A DHCP server (this port)
-  * A DHCP client
-  * A DHCP relay agent
-
-Version 3 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. 
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp40-server/pkg-message b/net/isc-dhcp40-server/pkg-message
deleted file mode 100644
index 02c3fad98765..000000000000
--- a/net/isc-dhcp40-server/pkg-message
+++ /dev/null
@@ -1,15 +0,0 @@
-****  To setup dhcpd, you may have to copy %%PREFIX%%/etc/dhcpd.conf.sample
-      to %%PREFIX%%/etc/dhcpd.conf for editing.
-
-****  This port installs dhcp daemon, but don't invokes dhcpd by default. If
-      you want to invoke dhcpd at startup, put these lines into /etc/rc.conf.
-
-	    dhcpd_enable="YES"
-	    dhcpd_flags=""				# command option(s)
-	    dhcpd_conf="%%PREFIX%%/etc/dhcpd.conf"	# configuration file
-	    dhcpd_ifaces=""				# ethernet interface(s)
-
-****  For instance, rc.conf like variables are still read from
-      %%PREFIX%%/etc/rc.isc-dhcpd.conf. They should be move into
-      /etc/rc.conf.  Also, the dhcpd_options variable must be
-      renamed dhcpd_flags.
diff --git a/net/isc-dhcp40-server/pkg-plist b/net/isc-dhcp40-server/pkg-plist
deleted file mode 100644
index 3212362358fa..000000000000
--- a/net/isc-dhcp40-server/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $FreeBSD$
-bin/omshell
-etc/dhcpd.conf.sample
-etc/rc.d/isc-dhcpd.sh
-sbin/dhcpd
-%%PORTDOCS%%%%DOCSDIR%%/ANONCVS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec [ -f /var/db/dhcpd.leases ] || touch /var/db/dhcpd.leases
-@unexec [ -s /var/db/dhcpd.leases ] || rm -f /var/db/dhcpd.leases
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
deleted file mode 100644
index 9392b8add91d..000000000000
--- a/net/kdenetwork4/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:	kdenetwork2
-# Date created:				2 November 2001
-# Whom:					will@cvs.kde.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	kdenetwork
-PORTVERSION=	${KDE_VERSION}
-CATEGORIES?=	net kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
-DIST_SUBDIR=	KDE
-
-MAINTAINER?=	kde@FreeBSD.org
-COMMENT=	Network-related programs and modules for KDE
-
-CONFLICTS=	kopete-*
-
-USE_KDELIBS_VER=3
-PREFIX=		${KDE_PREFIX}
-KDE_BUILD_PLIST=yes
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
-
-GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
-
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_KTALKD)
-UTMP?=	/var/run/utmp
-.if exists(${UTMP})
-PLIST_APPEND+=	plist.ktalkd
-.else
-DO_NOT_COMPILE+=	ktalkd
-pre-everything::
-	@${ECHO_MSG} "===> \"${UTMP}\" was not found."
-	@${ECHO_MSG} "===> The talk daemon (ktalkd) will not be built."
-.endif # exists(${UTMP})
-.else
-DO_NOT_COMPILE+=	ktalkd
-.endif # !defined(WITHOUT_KTALKD)
-
-.if defined(DO_NOT_COMPILE)
-CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-.endif # defined(DO_NOT_COMPILE)
-
-.include <bsd.port.post.mk>
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
deleted file mode 100644
index c3a47a56a3fe..000000000000
--- a/net/kdenetwork4/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (KDE/kdenetwork-3.2.2.tar.bz2) = 405ade1938cd74e3e9643f25814ee81d
-SIZE (KDE/kdenetwork-3.2.2.tar.bz2) = 6157487
diff --git a/net/kdenetwork4/files/plist.base b/net/kdenetwork4/files/plist.base
deleted file mode 100644
index 90bda46c8c05..000000000000
--- a/net/kdenetwork4/files/plist.base
+++ /dev/null
@@ -1,1392 +0,0 @@
-bin/dsirc
-bin/feedbrowser
-bin/kdict
-bin/kget
-bin/knewstickerstub
-bin/kopete
-bin/kppp
-bin/kppplogview
-bin/krdc
-bin/krfb
-bin/krfb_httpd
-bin/ksirc
-bin/lisa
-bin/reslisa
-bin/rssclient
-bin/rssservice
-include/rss/article.h
-include/rss/document.h
-include/rss/global.h
-include/rss/image.h
-include/rss/librss.h
-include/rss/loader.h
-include/rss/textinput.h
-lib/kconf_update_bin/kopete-account-kconf_update
-lib/kconf_update_bin/kopete-pluginloader2-kconf_update
-lib/kde3/kcm_kopete_accountconfig.la
-lib/kde3/kcm_kopete_accountconfig.so
-lib/kde3/kcm_kopete_appearanceconfig.la
-lib/kde3/kcm_kopete_appearanceconfig.so
-lib/kde3/kcm_kopete_autoreplace.la
-lib/kde3/kcm_kopete_autoreplace.so
-lib/kde3/kcm_kopete_behaviorconfig.la
-lib/kde3/kcm_kopete_behaviorconfig.so
-lib/kde3/kcm_kopete_cryptography.la
-lib/kde3/kcm_kopete_cryptography.so
-lib/kde3/kcm_kopete_highlight.la
-lib/kde3/kcm_kopete_highlight.so
-lib/kde3/kcm_kopete_history.la
-lib/kde3/kcm_kopete_history.so
-lib/kde3/kcm_kopete_msn.la
-lib/kde3/kcm_kopete_msn.so
-lib/kde3/kcm_kopete_nowlistening.la
-lib/kde3/kcm_kopete_nowlistening.so
-lib/kde3/kcm_kopete_texteffect.la
-lib/kde3/kcm_kopete_texteffect.so
-lib/kde3/kcm_kopete_translator.la
-lib/kde3/kcm_kopete_translator.so
-lib/kde3/kcm_kopete_webpresence.la
-lib/kde3/kcm_kopete_webpresence.so
-lib/kde3/kcm_krfb.la
-lib/kde3/kcm_krfb.so
-lib/kde3/kcm_lanbrowser.la
-lib/kde3/kcm_lanbrowser.so
-lib/kde3/kded_kinetd.la
-lib/kde3/kded_kinetd.so
-lib/kde3/kdict_panelapplet.la
-lib/kde3/kdict_panelapplet.so
-lib/kde3/khtml_kget.la
-lib/kde3/khtml_kget.so
-lib/kde3/kio_lan.la
-lib/kde3/kio_lan.so
-lib/kde3/knewsticker_panelapplet.la
-lib/kde3/knewsticker_panelapplet.so
-lib/kde3/kopete_aim.la
-lib/kde3/kopete_aim.so
-lib/kde3/kopete_autoreplace.la
-lib/kde3/kopete_autoreplace.so
-lib/kde3/kopete_chatwindow.la
-lib/kde3/kopete_chatwindow.so
-lib/kde3/kopete_connectionstatus.la
-lib/kde3/kopete_connectionstatus.so
-lib/kde3/kopete_contactnotes.la
-lib/kde3/kopete_contactnotes.so
-lib/kde3/kopete_cryptography.la
-lib/kde3/kopete_cryptography.so
-lib/kde3/kopete_highlight.la
-lib/kde3/kopete_highlight.so
-lib/kde3/kopete_history.la
-lib/kde3/kopete_history.so
-lib/kde3/kopete_icq.la
-lib/kde3/kopete_icq.so
-lib/kde3/kopete_irc.la
-lib/kde3/kopete_irc.so
-lib/kde3/kopete_jabber.la
-lib/kde3/kopete_jabber.so
-lib/kde3/kopete_msn.la
-lib/kde3/kopete_msn.so
-lib/kde3/kopete_nowlistening.la
-lib/kde3/kopete_nowlistening.so
-lib/kde3/kopete_sms.la
-lib/kde3/kopete_sms.so
-lib/kde3/kopete_texteffect.la
-lib/kde3/kopete_texteffect.so
-lib/kde3/kopete_translator.la
-lib/kde3/kopete_translator.so
-lib/kde3/kopete_webpresence.la
-lib/kde3/kopete_webpresence.so
-lib/kde3/kopete_yahoo.la
-lib/kde3/kopete_yahoo.so
-lib/kde3/kpf_panelapplet.la
-lib/kde3/kpf_panelapplet.so
-lib/kde3/kpfpropertiesdialog.la
-lib/kde3/kpfpropertiesdialog.so
-lib/kde3/ksirc.la
-lib/kde3/ksirc.so
-lib/kde3/libkntsrcfilepropsdlg.la
-lib/kde3/libkntsrcfilepropsdlg.so
-lib/kde3/libkrichtexteditpart.la
-lib/kde3/libkrichtexteditpart.so
-lib/libkdeinit_ksirc.la
-lib/libkdeinit_ksirc.so
-lib/libkopete.la
-lib/libkopete.so
-lib/libkopete.so.1
-lib/libkopete_msn_shared.la
-lib/libkopete_msn_shared.so
-lib/libkopete_msn_shared.so.0
-lib/libkopete_oscar.la
-lib/libkopete_oscar.so
-lib/libkopete_oscar.so.1
-lib/librss.la
-lib/librss.so
-lib/librss.so.1
-share/applications/kde/Kppp.desktop
-share/applications/kde/kcmkrfb.desktop
-share/applications/kde/kdict.desktop
-share/applications/kde/kget.desktop
-share/applications/kde/knewsticker-standalone.desktop
-share/applications/kde/kppplogview.desktop
-share/applications/kde/krdc.desktop
-share/applications/kde/krfb.desktop
-share/applications/kde/ksirc.desktop
-share/applnk/.hidden/kcmkiolan.desktop
-share/applnk/.hidden/kcmlisa.desktop
-share/applnk/.hidden/kcmreslisa.desktop
-share/applnk/.hidden/knewstickerstub.desktop
-share/applnk/Internet/kopete.desktop
-share/apps/kconf_update/knewsticker.upd
-share/apps/kconf_update/knt-0.1-0.2.pl
-share/apps/kconf_update/kopete-account-kconf_update.sh
-share/apps/kconf_update/kopete-account-kconf_update.upd
-share/apps/kconf_update/kopete-pluginloader.pl
-share/apps/kconf_update/kopete-pluginloader.upd
-share/apps/kconf_update/kopete-pluginloader2.sh
-share/apps/kconf_update/kopete-pluginloader2.upd
-share/apps/kdict/icons/crystalsvg/16x16/actions/define_clip.png
-share/apps/kdict/icons/crystalsvg/16x16/actions/query_erase.png
-share/apps/kdict/icons/crystalsvg/22x22/actions/define_clip.png
-share/apps/kdict/icons/crystalsvg/32x32/actions/define_clip.png
-share/apps/kdict/kdictui.rc
-share/apps/kget/icons/crystalsvg/22x22/actions/bar0.png
-share/apps/kget/icons/crystalsvg/22x22/actions/bar1.png
-share/apps/kget/icons/crystalsvg/22x22/actions/bar2.png
-share/apps/kget/icons/crystalsvg/22x22/actions/bar3.png
-share/apps/kget/icons/crystalsvg/22x22/actions/bar4.png
-share/apps/kget/icons/crystalsvg/22x22/actions/bar5.png
-share/apps/kget/icons/crystalsvg/22x22/actions/bar6.png
-share/apps/kget/icons/crystalsvg/22x22/actions/dock.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_clipboard.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_delay.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_delete.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_disconnect.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_dock.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_drop_target.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_expert.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_logwindow.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_normal.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_offline_mode_off.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_offline_mode_on.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_paste.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_pause.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_preferences.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_queue.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_restart.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_resume.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_shutdown.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_timer.png
-share/apps/kget/icons/crystalsvg/22x22/actions/tool_uselastdir.png
-share/apps/kget/kgetui.rc
-share/apps/kget/pics/connect0.png
-share/apps/kget/pics/connect1.png
-share/apps/kget/pics/connect2.png
-share/apps/kget/pics/connect3.png
-share/apps/kget/pics/connect4.png
-share/apps/kget/pics/connect5.png
-share/apps/kget/pics/connect6.png
-share/apps/kget/pics/connect7.png
-share/apps/kget/pics/md_delayed.png
-share/apps/kget/pics/md_finished.png
-share/apps/kget/pics/md_queued.png
-share/apps/kget/pics/md_scheduled.png
-share/apps/kget/pics/retrying.png
-share/apps/kget/pics/target.png
-share/apps/kget/pics/try0.png
-share/apps/kget/pics/try1.png
-share/apps/kget/pics/try2.png
-share/apps/kget/pics/try3.png
-share/apps/kget/pics/try4.png
-share/apps/kget/pics/try5.png
-share/apps/kget/pics/try6.png
-share/apps/kget/pics/try7.png
-share/apps/kget/sounds/added.wav
-share/apps/kget/sounds/finished.wav
-share/apps/kget/sounds/finishedall.wav
-share/apps/kget/sounds/started.wav
-share/apps/khtml/kpartplugins/kget_plug_in.rc
-share/apps/kicker/applets/kdictapplet.desktop
-share/apps/kicker/applets/knewsticker.desktop
-share/apps/kicker/applets/kpfapplet.desktop
-share/apps/kinetd/eventsrc
-share/apps/knewsticker/eventsrc
-share/apps/konqueror/dirtree/remote/lan.desktop
-share/apps/kopete/eventsrc
-share/apps/kopete/historychatui.rc
-share/apps/kopete/icons/crystalsvg/128x128/apps/aim_protocol.png
-share/apps/kopete/icons/crystalsvg/128x128/apps/icq_protocol.png
-share/apps/kopete/icons/crystalsvg/128x128/apps/msn_protocol.png
-share/apps/kopete/icons/crystalsvg/128x128/apps/sms_protocol.png
-share/apps/kopete/icons/crystalsvg/128x128/apps/yahoo_protocol.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/admin_icon.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/aim_away.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/aim_connecting.mng
-share/apps/kopete/icons/crystalsvg/16x16/actions/aim_offline.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/aim_online.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/aol_icon.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/dt_icon.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/emoticon.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/free_icon.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/icq_away.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/icq_connecting.mng
-share/apps/kopete/icons/crystalsvg/16x16/actions/icq_dnd.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/icq_ffc.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/icq_invisible.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/icq_na.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/icq_occupied.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/icq_offline.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/icq_online.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/irc_away.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/irc_channel.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/irc_connecting.mng
-share/apps/kopete/icons/crystalsvg/16x16/actions/irc_normal.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/irc_online.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/irc_op.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/irc_server.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/irc_voice.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_away.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_chatty.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_connecting.mng
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_group.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_invisible.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_na.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_offline.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_online.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_original.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_raw.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_serv_off.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_serv_on.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_xa.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/kopeteavailable.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/kopeteaway.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_away.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_offline.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_online.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_unknown.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/msn_away.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/msn_blocked.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/msn_brb.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/msn_busy.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/msn_connecting.mng
-share/apps/kopete/icons/crystalsvg/16x16/actions/msn_invisible.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/msn_lunch.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/msn_na.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/msn_newmsg.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/msn_offline.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/msn_online.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/msn_phone.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/newmsg.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/status_unknown.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_away.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_busy.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_idle.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_invisible.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_mobile.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_tea.png
-share/apps/kopete/icons/crystalsvg/16x16/apps/aim_protocol.png
-share/apps/kopete/icons/crystalsvg/16x16/apps/icq_protocol.png
-share/apps/kopete/icons/crystalsvg/16x16/apps/irc_protocol.png
-share/apps/kopete/icons/crystalsvg/16x16/apps/jabber_protocol.png
-share/apps/kopete/icons/crystalsvg/16x16/apps/msn_protocol.png
-share/apps/kopete/icons/crystalsvg/16x16/apps/sms_protocol.png
-share/apps/kopete/icons/crystalsvg/16x16/apps/yahoo_protocol.png
-share/apps/kopete/icons/crystalsvg/22x22/actions/kopeteavailable.png
-share/apps/kopete/icons/crystalsvg/22x22/actions/kopeteaway.png
-share/apps/kopete/icons/crystalsvg/32x32/actions/aol_icon.png
-share/apps/kopete/icons/crystalsvg/32x32/actions/kopeteavailable.png
-share/apps/kopete/icons/crystalsvg/32x32/actions/kopeteaway.png
-share/apps/kopete/icons/crystalsvg/32x32/actions/newmessage.mng
-share/apps/kopete/icons/crystalsvg/32x32/apps/aim_protocol.png
-share/apps/kopete/icons/crystalsvg/32x32/apps/autoreplace.png
-share/apps/kopete/icons/crystalsvg/32x32/apps/highlight.png
-share/apps/kopete/icons/crystalsvg/32x32/apps/icq_protocol.png
-share/apps/kopete/icons/crystalsvg/32x32/apps/irc_protocol.png
-share/apps/kopete/icons/crystalsvg/32x32/apps/jabber_protocol.png
-share/apps/kopete/icons/crystalsvg/32x32/apps/msn_protocol.png
-share/apps/kopete/icons/crystalsvg/32x32/apps/sms_protocol.png
-share/apps/kopete/icons/crystalsvg/32x32/apps/texteffect.png
-share/apps/kopete/icons/crystalsvg/32x32/apps/yahoo_protocol.png
-share/apps/kopete/icons/crystalsvg/48x48/actions/kopeteavailable.png
-share/apps/kopete/icons/crystalsvg/48x48/actions/kopeteaway.png
-share/apps/kopete/icons/crystalsvg/48x48/apps/aim_protocol.png
-share/apps/kopete/icons/crystalsvg/48x48/apps/icq_protocol.png
-share/apps/kopete/icons/crystalsvg/48x48/apps/jabber_protocol.png
-share/apps/kopete/icons/crystalsvg/48x48/apps/msn_protocol.png
-share/apps/kopete/icons/crystalsvg/48x48/apps/sms_protocol.png
-share/apps/kopete/icons/crystalsvg/48x48/apps/yahoo_protocol.png
-share/apps/kopete/icons/crystalsvg/64x64/apps/aim_protocol.png
-share/apps/kopete/icons/crystalsvg/64x64/apps/icq_protocol.png
-share/apps/kopete/icons/crystalsvg/64x64/apps/msn_protocol.png
-share/apps/kopete/icons/crystalsvg/64x64/apps/sms_protocol.png
-share/apps/kopete/icons/crystalsvg/64x64/apps/yahoo_protocol.png
-share/apps/kopete/ircchatui.rc
-share/apps/kopete/kopetechatwindow.rc
-share/apps/kopete/kopeteemailwindow.rc
-share/apps/kopete/kopeteui.rc
-share/apps/kopete/msnchatui.rc
-share/apps/kopete/nowlisteningchatui.rc
-share/apps/kopete/nowlisteningui.rc
-share/apps/kopete/pics/emoticons/Boxed/angry.png
-share/apps/kopete/pics/emoticons/Boxed/bigsmile.png
-share/apps/kopete/pics/emoticons/Boxed/confused.png
-share/apps/kopete/pics/emoticons/Boxed/cry.png
-share/apps/kopete/pics/emoticons/Boxed/emoticons.xml
-share/apps/kopete/pics/emoticons/Boxed/oh.png
-share/apps/kopete/pics/emoticons/Boxed/sad.png
-share/apps/kopete/pics/emoticons/Boxed/shade.png
-share/apps/kopete/pics/emoticons/Boxed/smile.png
-share/apps/kopete/pics/emoticons/Boxed/tongue.png
-share/apps/kopete/pics/emoticons/Boxed/wink.png
-share/apps/kopete/pics/emoticons/Default/angry.png
-share/apps/kopete/pics/emoticons/Default/bat.png
-share/apps/kopete/pics/emoticons/Default/beer.png
-share/apps/kopete/pics/emoticons/Default/biggrin.png
-share/apps/kopete/pics/emoticons/Default/cake.png
-share/apps/kopete/pics/emoticons/Default/camera.png
-share/apps/kopete/pics/emoticons/Default/cat.png
-share/apps/kopete/pics/emoticons/Default/clock.png
-share/apps/kopete/pics/emoticons/Default/cocktail.png
-share/apps/kopete/pics/emoticons/Default/confused.png
-share/apps/kopete/pics/emoticons/Default/cry.png
-share/apps/kopete/pics/emoticons/Default/cup.png
-share/apps/kopete/pics/emoticons/Default/dog.png
-share/apps/kopete/pics/emoticons/Default/email.png
-share/apps/kopete/pics/emoticons/Default/embarassed.png
-share/apps/kopete/pics/emoticons/Default/emoticons.xml
-share/apps/kopete/pics/emoticons/Default/film.png
-share/apps/kopete/pics/emoticons/Default/kiss.png
-share/apps/kopete/pics/emoticons/Default/lightbulb.png
-share/apps/kopete/pics/emoticons/Default/love.png
-share/apps/kopete/pics/emoticons/Default/note.png
-share/apps/kopete/pics/emoticons/Default/oh.png
-share/apps/kopete/pics/emoticons/Default/omg.png
-share/apps/kopete/pics/emoticons/Default/phone.png
-share/apps/kopete/pics/emoticons/Default/present.png
-share/apps/kopete/pics/emoticons/Default/rose.png
-share/apps/kopete/pics/emoticons/Default/sad.png
-share/apps/kopete/pics/emoticons/Default/shade.png
-share/apps/kopete/pics/emoticons/Default/sleep.png
-share/apps/kopete/pics/emoticons/Default/smile.png
-share/apps/kopete/pics/emoticons/Default/star.png
-share/apps/kopete/pics/emoticons/Default/teeth.png
-share/apps/kopete/pics/emoticons/Default/thumbs_down.png
-share/apps/kopete/pics/emoticons/Default/thumbs_up.png
-share/apps/kopete/pics/emoticons/Default/tongue.png
-share/apps/kopete/pics/emoticons/Default/unhappy.png
-share/apps/kopete/pics/emoticons/Default/unlove.png
-share/apps/kopete/pics/emoticons/Default/wilted_rose.png
-share/apps/kopete/pics/emoticons/Default/wink.png
-share/apps/kopete/pics/emoticons/KMess-Blue/angry.png
-share/apps/kopete/pics/emoticons/KMess-Blue/confused.png
-share/apps/kopete/pics/emoticons/KMess-Blue/cry.png
-share/apps/kopete/pics/emoticons/KMess-Blue/embarassed.png
-share/apps/kopete/pics/emoticons/KMess-Blue/emoticons.xml
-share/apps/kopete/pics/emoticons/KMess-Blue/omg.png
-share/apps/kopete/pics/emoticons/KMess-Blue/sad.png
-share/apps/kopete/pics/emoticons/KMess-Blue/shade.png
-share/apps/kopete/pics/emoticons/KMess-Blue/smile.png
-share/apps/kopete/pics/emoticons/KMess-Blue/teeth.png
-share/apps/kopete/pics/emoticons/KMess-Blue/tongue.png
-share/apps/kopete/pics/emoticons/KMess-Blue/wink.png
-share/apps/kopete/pics/emoticons/KMess-Cartoon/angel.png
-share/apps/kopete/pics/emoticons/KMess-Cartoon/angry.png
-share/apps/kopete/pics/emoticons/KMess-Cartoon/confused.png
-share/apps/kopete/pics/emoticons/KMess-Cartoon/cry.png
-share/apps/kopete/pics/emoticons/KMess-Cartoon/devil.png
-share/apps/kopete/pics/emoticons/KMess-Cartoon/embarrassed.png
-share/apps/kopete/pics/emoticons/KMess-Cartoon/emoticons.xml
-share/apps/kopete/pics/emoticons/KMess-Cartoon/omg.png
-share/apps/kopete/pics/emoticons/KMess-Cartoon/sad.png
-share/apps/kopete/pics/emoticons/KMess-Cartoon/shade.png
-share/apps/kopete/pics/emoticons/KMess-Cartoon/smile.png
-share/apps/kopete/pics/emoticons/KMess-Cartoon/teeth.png
-share/apps/kopete/pics/emoticons/KMess-Cartoon/tongue.png
-share/apps/kopete/pics/emoticons/KMess-Cartoon/ugly.png
-share/apps/kopete/pics/emoticons/KMess-Cartoon/wink.png
-share/apps/kopete/pics/emoticons/KMess-Violet/angry.png
-share/apps/kopete/pics/emoticons/KMess-Violet/confused.png
-share/apps/kopete/pics/emoticons/KMess-Violet/cry.png
-share/apps/kopete/pics/emoticons/KMess-Violet/embarassed.png
-share/apps/kopete/pics/emoticons/KMess-Violet/emoticons.xml
-share/apps/kopete/pics/emoticons/KMess-Violet/omg.png
-share/apps/kopete/pics/emoticons/KMess-Violet/sad.png
-share/apps/kopete/pics/emoticons/KMess-Violet/shade.png
-share/apps/kopete/pics/emoticons/KMess-Violet/smile.png
-share/apps/kopete/pics/emoticons/KMess-Violet/teeth.png
-share/apps/kopete/pics/emoticons/KMess-Violet/tongue.png
-share/apps/kopete/pics/emoticons/KMess-Violet/wink.png
-share/apps/kopete/pics/emoticons/KMess/angel.png
-share/apps/kopete/pics/emoticons/KMess/angry.png
-share/apps/kopete/pics/emoticons/KMess/bat.png
-share/apps/kopete/pics/emoticons/KMess/beer.png
-share/apps/kopete/pics/emoticons/KMess/boy.png
-share/apps/kopete/pics/emoticons/KMess/cake.png
-share/apps/kopete/pics/emoticons/KMess/camera.png
-share/apps/kopete/pics/emoticons/KMess/cat.png
-share/apps/kopete/pics/emoticons/KMess/clock.png
-share/apps/kopete/pics/emoticons/KMess/cocktail.png
-share/apps/kopete/pics/emoticons/KMess/confused.png
-share/apps/kopete/pics/emoticons/KMess/cry.png
-share/apps/kopete/pics/emoticons/KMess/cup.png
-share/apps/kopete/pics/emoticons/KMess/devil.png
-share/apps/kopete/pics/emoticons/KMess/dog.png
-share/apps/kopete/pics/emoticons/KMess/dude_hug.png
-share/apps/kopete/pics/emoticons/KMess/email.png
-share/apps/kopete/pics/emoticons/KMess/embarassed.png
-share/apps/kopete/pics/emoticons/KMess/emoticons.xml
-share/apps/kopete/pics/emoticons/KMess/film.png
-share/apps/kopete/pics/emoticons/KMess/girl.png
-share/apps/kopete/pics/emoticons/KMess/girl_hug.png
-share/apps/kopete/pics/emoticons/KMess/kiss.png
-share/apps/kopete/pics/emoticons/KMess/lightbulb.png
-share/apps/kopete/pics/emoticons/KMess/love.png
-share/apps/kopete/pics/emoticons/KMess/messenger.png
-share/apps/kopete/pics/emoticons/KMess/note.png
-share/apps/kopete/pics/emoticons/KMess/omg.png
-share/apps/kopete/pics/emoticons/KMess/phone.png
-share/apps/kopete/pics/emoticons/KMess/present.png
-share/apps/kopete/pics/emoticons/KMess/rose.png
-share/apps/kopete/pics/emoticons/KMess/sad.png
-share/apps/kopete/pics/emoticons/KMess/shade.png
-share/apps/kopete/pics/emoticons/KMess/smile.png
-share/apps/kopete/pics/emoticons/KMess/star.png
-share/apps/kopete/pics/emoticons/KMess/teeth.png
-share/apps/kopete/pics/emoticons/KMess/thumbs_down.png
-share/apps/kopete/pics/emoticons/KMess/thumbs_up.png
-share/apps/kopete/pics/emoticons/KMess/tongue.png
-share/apps/kopete/pics/emoticons/KMess/unlove.png
-share/apps/kopete/pics/emoticons/KMess/wilted_rose.png
-share/apps/kopete/pics/emoticons/KMess/wink.png
-share/apps/kopete/pics/emoticons/Plain/biggrin.png
-share/apps/kopete/pics/emoticons/Plain/confused.png
-share/apps/kopete/pics/emoticons/Plain/cry.png
-share/apps/kopete/pics/emoticons/Plain/emoticons.xml
-share/apps/kopete/pics/emoticons/Plain/oh.png
-share/apps/kopete/pics/emoticons/Plain/pig.png
-share/apps/kopete/pics/emoticons/Plain/smile.png
-share/apps/kopete/pics/emoticons/Plain/sunglasses.png
-share/apps/kopete/pics/emoticons/Plain/tongue.png
-share/apps/kopete/pics/emoticons/Plain/unhappy.png
-share/apps/kopete/pics/emoticons/Plain/wink.png
-share/apps/kopete/pics/emoticons/RedOnes/angel.png
-share/apps/kopete/pics/emoticons/RedOnes/biggrin.png
-share/apps/kopete/pics/emoticons/RedOnes/confused.png
-share/apps/kopete/pics/emoticons/RedOnes/cry.png
-share/apps/kopete/pics/emoticons/RedOnes/emoticons.xml
-share/apps/kopete/pics/emoticons/RedOnes/oh.png
-share/apps/kopete/pics/emoticons/RedOnes/smile.png
-share/apps/kopete/pics/emoticons/RedOnes/sunglasses.png
-share/apps/kopete/pics/emoticons/RedOnes/tongue.png
-share/apps/kopete/pics/emoticons/RedOnes/unhappy.png
-share/apps/kopete/pics/emoticons/RedOnes/wink.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/angry.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/big_smile.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/confused.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/cool.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/emoticons.xml
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/lol.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/ooooh.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/sad.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/smile.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/tongue_out.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/wink.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/angry.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/big_smile.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/confused.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/cool.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/emoticons.xml
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/lol.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/ooooh.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/sad.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/smile.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/tongue_out.png
-share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/wink.png
-share/apps/kopete/pics/emoticons/ccmathteam.com/biggrin.png
-share/apps/kopete/pics/emoticons/ccmathteam.com/confused.png
-share/apps/kopete/pics/emoticons/ccmathteam.com/cry.png
-share/apps/kopete/pics/emoticons/ccmathteam.com/devil.png
-share/apps/kopete/pics/emoticons/ccmathteam.com/emoticons.xml
-share/apps/kopete/pics/emoticons/ccmathteam.com/oh.png
-share/apps/kopete/pics/emoticons/ccmathteam.com/smile.png
-share/apps/kopete/pics/emoticons/ccmathteam.com/sunglasses.png
-share/apps/kopete/pics/emoticons/ccmathteam.com/tongue.png
-share/apps/kopete/pics/emoticons/ccmathteam.com/unhappy.png
-share/apps/kopete/pics/emoticons/ccmathteam.com/wink.png
-share/apps/kopete/pics/emoticons/greggman.com/biggrin.png
-share/apps/kopete/pics/emoticons/greggman.com/confused.png
-share/apps/kopete/pics/emoticons/greggman.com/emoticons.xml
-share/apps/kopete/pics/emoticons/greggman.com/kiss.png
-share/apps/kopete/pics/emoticons/greggman.com/oh.png
-share/apps/kopete/pics/emoticons/greggman.com/smile.png
-share/apps/kopete/pics/emoticons/greggman.com/sunglasses.png
-share/apps/kopete/pics/emoticons/greggman.com/tongue.png
-share/apps/kopete/pics/emoticons/greggman.com/unhappy.png
-share/apps/kopete/pics/emoticons/greggman.com/vampire.png
-share/apps/kopete/pics/emoticons/greggman.com/wink.png
-share/apps/kopete/pics/emoticons/phpBB/biggrin.png
-share/apps/kopete/pics/emoticons/phpBB/confused.png
-share/apps/kopete/pics/emoticons/phpBB/cry.png
-share/apps/kopete/pics/emoticons/phpBB/devil.png
-share/apps/kopete/pics/emoticons/phpBB/emoticons.xml
-share/apps/kopete/pics/emoticons/phpBB/oh.png
-share/apps/kopete/pics/emoticons/phpBB/smile.png
-share/apps/kopete/pics/emoticons/phpBB/sunglasses.png
-share/apps/kopete/pics/emoticons/phpBB/tongue.png
-share/apps/kopete/pics/emoticons/phpBB/unhappy.png
-share/apps/kopete/pics/emoticons/phpBB/wink.png
-share/apps/kopete/pics/emoticons/tweakers.net/biggrin.png
-share/apps/kopete/pics/emoticons/tweakers.net/cry.png
-share/apps/kopete/pics/emoticons/tweakers.net/emoticons.xml
-share/apps/kopete/pics/emoticons/tweakers.net/oh.png
-share/apps/kopete/pics/emoticons/tweakers.net/sleep.png
-share/apps/kopete/pics/emoticons/tweakers.net/smile.png
-share/apps/kopete/pics/emoticons/tweakers.net/tongue.png
-share/apps/kopete/pics/emoticons/tweakers.net/unhappy.png
-share/apps/kopete/pics/emoticons/tweakers.net/wink.png
-share/apps/kopete/styles/Enclosed.xsl
-share/apps/kopete/styles/Keramik.xsl
-share/apps/kopete/styles/Kopete.xsl
-share/apps/kopete/styles/MSN.xsl
-share/apps/kopete/styles/Minimal.xsl
-share/apps/kopete/styles/XChat.xsl
-share/apps/kopete/translatorchatui.rc
-share/apps/kopete/webpresence/webpresencedefault.xsl
-share/apps/kopete/webpresence/wpimages.xsl
-share/apps/kopete_contactnotes/contactnotesui.rc
-share/apps/kopete_cryptography/cryptographyui.rc
-share/apps/kopete_history/historychatui.rc
-share/apps/kopete_history/historyui.rc
-share/apps/kopete_translator/translatorui.rc
-share/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc
-share/apps/kopeterichtexteditpart/kopeterichtexteditpartsimple.rc
-share/apps/kppp/Provider/Austria/.directory
-share/apps/kppp/Provider/Austria/Simon%032Media
-share/apps/kppp/Provider/Belarus/.directory
-share/apps/kppp/Provider/Belarus/AtlantTelecom
-share/apps/kppp/Provider/Czech_Republic/.directory
-share/apps/kppp/Provider/Czech_Republic/AICOM
-share/apps/kppp/Provider/Czech_Republic/ARsystem
-share/apps/kppp/Provider/Czech_Republic/ASYS
-share/apps/kppp/Provider/Czech_Republic/ApexNet
-share/apps/kppp/Provider/Czech_Republic/BohemiaNet
-share/apps/kppp/Provider/Czech_Republic/Brailcom
-share/apps/kppp/Provider/Czech_Republic/CITYNET
-share/apps/kppp/Provider/Czech_Republic/Contactel
-share/apps/kppp/Provider/Czech_Republic/ES-servis
-share/apps/kppp/Provider/Czech_Republic/Econnect
-share/apps/kppp/Provider/Czech_Republic/Falco_computer
-share/apps/kppp/Provider/Czech_Republic/Fortech
-share/apps/kppp/Provider/Czech_Republic/HP-NET
-share/apps/kppp/Provider/Czech_Republic/INTERNET_OnLine
-share/apps/kppp/Provider/Czech_Republic/INTERNEXT
-share/apps/kppp/Provider/Czech_Republic/IQNET
-share/apps/kppp/Provider/Czech_Republic/KPNQuest
-share/apps/kppp/Provider/Czech_Republic/M-soft
-share/apps/kppp/Provider/Czech_Republic/Nextra
-share/apps/kppp/Provider/Czech_Republic/ProfiNet
-share/apps/kppp/Provider/Czech_Republic/SeverNET
-share/apps/kppp/Provider/Czech_Republic/Video_OnLine
-share/apps/kppp/Provider/Czech_Republic/Volny
-share/apps/kppp/Provider/Denmark/.directory
-share/apps/kppp/Provider/Denmark/Get2Net
-share/apps/kppp/Provider/France/.directory
-share/apps/kppp/Provider/France/ClubInternetFull
-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/Irland/.directory
-share/apps/kppp/Provider/Irland/Eircom
-share/apps/kppp/Provider/Irland/IOL
-share/apps/kppp/Provider/Irland/UTV
-share/apps/kppp/Provider/Irland/UVT
-share/apps/kppp/Provider/Netherlands/.directory
-share/apps/kppp/Provider/Netherlands/12Move
-share/apps/kppp/Provider/Netherlands/Avades
-share/apps/kppp/Provider/Netherlands/Bart
-share/apps/kppp/Provider/Netherlands/Betuwenet%032BFree
-share/apps/kppp/Provider/Netherlands/Betuwenet%032BQuality
-share/apps/kppp/Provider/Netherlands/Cistron
-share/apps/kppp/Provider/Netherlands/Concepts%032ICT
-share/apps/kppp/Provider/Netherlands/Cubic%032Circle
-share/apps/kppp/Provider/Netherlands/Cybercomm
-share/apps/kppp/Provider/Netherlands/Dataweb
-share/apps/kppp/Provider/Netherlands/Daxis%032Internet
-share/apps/kppp/Provider/Netherlands/Demon%032Internet
-share/apps/kppp/Provider/Netherlands/Energis-Ision
-share/apps/kppp/Provider/Netherlands/Euronet%032anytime
-share/apps/kppp/Provider/Netherlands/Euronet%032professional
-share/apps/kppp/Provider/Netherlands/FlakkeeNet
-share/apps/kppp/Provider/Netherlands/FreeAcces
-share/apps/kppp/Provider/Netherlands/Freeler%032basis
-share/apps/kppp/Provider/Netherlands/Freeler%032compleet
-share/apps/kppp/Provider/Netherlands/Freeler%032voordelig
-share/apps/kppp/Provider/Netherlands/HCC%032NET
-share/apps/kppp/Provider/Netherlands/Hacom
-share/apps/kppp/Provider/Netherlands/HetNet%032Basis%032Surfen
-share/apps/kppp/Provider/Netherlands/HetNet%032Frequent%032Surfen
-share/apps/kppp/Provider/Netherlands/HetNet%032Regelmatig%032Surfen
-share/apps/kppp/Provider/Netherlands/IAE
-share/apps/kppp/Provider/Netherlands/ILimburg
-share/apps/kppp/Provider/Netherlands/InterNLnet
-share/apps/kppp/Provider/Netherlands/Interbox
-share/apps/kppp/Provider/Netherlands/Internet%032Acces%032Facilities
-share/apps/kppp/Provider/Netherlands/Internet%032Online
-share/apps/kppp/Provider/Netherlands/Interstroom
-share/apps/kppp/Provider/Netherlands/IntroWeb%032Hengelo%032e.o.
-share/apps/kppp/Provider/Netherlands/IntroWeb%032met%0323-cijferig%032kengetal
-share/apps/kppp/Provider/Netherlands/IntroWeb%032met%0324-cijferig%032kengetal
-share/apps/kppp/Provider/Netherlands/Kabelfoon
-share/apps/kppp/Provider/Netherlands/KeyAcces%032met%0323%032cijferig%032kengetal
-share/apps/kppp/Provider/Netherlands/KeyAcces%032met%0324%032cijferig%032kengetal
-share/apps/kppp/Provider/Netherlands/Luna
-share/apps/kppp/Provider/Netherlands/Macom
-share/apps/kppp/Provider/Netherlands/Nederland.net
-share/apps/kppp/Provider/Netherlands/Planet%032Internet%032Premium
-share/apps/kppp/Provider/Netherlands/Planet%032Internet%032Standaard
-share/apps/kppp/Provider/Netherlands/Plant%032Acces
-share/apps/kppp/Provider/Netherlands/Popin
-share/apps/kppp/Provider/Netherlands/PublishNet
-share/apps/kppp/Provider/Netherlands/Raketnet
-share/apps/kppp/Provider/Netherlands/Solcon
-share/apps/kppp/Provider/Netherlands/Support%032Net
-share/apps/kppp/Provider/Netherlands/Telebyte
-share/apps/kppp/Provider/Netherlands/Tiscali%032Compleet
-share/apps/kppp/Provider/Netherlands/Tiscali%032Gratis
-share/apps/kppp/Provider/Netherlands/UwNet
-share/apps/kppp/Provider/Netherlands/Via%032Networks
-share/apps/kppp/Provider/Netherlands/Wannadoo%032budget
-share/apps/kppp/Provider/Netherlands/Wannadoo%032budget%320plus
-share/apps/kppp/Provider/Netherlands/Wannadoo%032smartpack
-share/apps/kppp/Provider/Netherlands/Wirehub
-share/apps/kppp/Provider/Netherlands/XS4All
-share/apps/kppp/Provider/Netherlands/Zeelandnet
-share/apps/kppp/Provider/Netherlands/Zon%0322
-share/apps/kppp/Provider/Netherlands/Zon%032Gratis
-share/apps/kppp/Provider/Netherlands/Zon%032Inclusief
-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/Slovenia/AmisNet
-share/apps/kppp/Provider/Slovenia/Arnes
-share/apps/kppp/Provider/Slovenia/Kiss
-share/apps/kppp/Provider/Slovenia/MojNet
-share/apps/kppp/Provider/Slovenia/SiOL
-share/apps/kppp/Provider/Slovenia/Volja
-share/apps/kppp/Provider/Sweden/.directory
-share/apps/kppp/Provider/Sweden/Tiscali
-share/apps/kppp/Provider/Sweden/Utfors
-share/apps/kppp/Provider/Switzerland/.directory
-share/apps/kppp/Provider/Switzerland/Bluewin
-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/Ukraine/.directory
-share/apps/kppp/Provider/Ukraine/Adamant
-share/apps/kppp/Provider/Ukraine/IPTelecom
-share/apps/kppp/Provider/Ukraine/NuVse
-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/Provider/United_Kingdom/UK%032Free%032Software%032Network%032ISDN
-share/apps/kppp/Provider/United_Kingdom/UK%032Free%032Software%032Network%032Modem
-share/apps/kppp/Provider/United_Kingdom/UKPOST%032ISDN
-share/apps/kppp/Provider/United_Kingdom/UKPOST%032Modem
-share/apps/kppp/Provider/Yugoslavia/041Net
-share/apps/kppp/Provider/Yugoslavia/BeoTelNet
-share/apps/kppp/Provider/Yugoslavia/CG.Bar.yu
-share/apps/kppp/Provider/Yugoslavia/CG.Berane.yu
-share/apps/kppp/Provider/Yugoslavia/CG.BijeloPolje.CG.yu
-share/apps/kppp/Provider/Yugoslavia/CG.Budva.yu
-share/apps/kppp/Provider/Yugoslavia/CG.Cetinje.yu
-share/apps/kppp/Provider/Yugoslavia/CG.HercegNovi.yu
-share/apps/kppp/Provider/Yugoslavia/CG.Kotor.yu
-share/apps/kppp/Provider/Yugoslavia/CG.Niksic.yu
-share/apps/kppp/Provider/Yugoslavia/CG.Pljevlja.yu
-share/apps/kppp/Provider/Yugoslavia/CG.Podgorica.yu
-share/apps/kppp/Provider/Yugoslavia/CG.Tivat.yu
-share/apps/kppp/Provider/Yugoslavia/CG.Ulcinj.yu
-share/apps/kppp/Provider/Yugoslavia/CG.yu
-share/apps/kppp/Provider/Yugoslavia/DrenikNet
-share/apps/kppp/Provider/Yugoslavia/EUnet@Full
-share/apps/kppp/Provider/Yugoslavia/EUnet@Lite
-share/apps/kppp/Provider/Yugoslavia/EUnetBeograd
-share/apps/kppp/Provider/Yugoslavia/EUnetCacak
-share/apps/kppp/Provider/Yugoslavia/EUnetKragujevac
-share/apps/kppp/Provider/Yugoslavia/EUnetNis
-share/apps/kppp/Provider/Yugoslavia/EUnetNoviSad
-share/apps/kppp/Provider/Yugoslavia/EUnetPristina
-share/apps/kppp/Provider/Yugoslavia/EUnetSombor
-share/apps/kppp/Provider/Yugoslavia/EUnetSubotica
-share/apps/kppp/Provider/Yugoslavia/InfoSKY
-share/apps/kppp/Provider/Yugoslavia/PTT
-share/apps/kppp/Provider/Yugoslavia/SCnet
-share/apps/kppp/Provider/Yugoslavia/Sezampro
-share/apps/kppp/Provider/Yugoslavia/SuOnline
-share/apps/kppp/Provider/Yugoslavia/TippNet
-share/apps/kppp/Provider/Yugoslavia/VeratNet
-share/apps/kppp/Provider/Yugoslavia/YUBCnet
-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_internet_euro.rst
-share/apps/kppp/Rules/Belgium/Belgium_internet_frank.rst
-share/apps/kppp/Rules/Belgium/Belgium_interzonal.rst
-share/apps/kppp/Rules/Belgium/Belgium_zonal.rst
-share/apps/kppp/Rules/Bosnia_and_Herzegovina/BiHnet_-_home_-_bez_impulsa.rst
-share/apps/kppp/Rules/Bosnia_and_Herzegovina/BiHnet_-_student_-_bez_impulsa.rst
-share/apps/kppp/Rules/Bosnia_and_Herzegovina/SmartNet_PERSONAL_bez_impulsa.rst
-share/apps/kppp/Rules/Bosnia_and_Herzegovina/samo_impulsi.rst
-share/apps/kppp/Rules/Brasil/Brasil.rst
-share/apps/kppp/Rules/Brasil/Brasil_Ligbr.rst
-share/apps/kppp/Rules/Brasil/Rio_de_Janeiro.rst
-share/apps/kppp/Rules/Brasil/SaoPaulo.rst
-share/apps/kppp/Rules/Croatia/CARNet.rst
-share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_Business_Internet.rst
-share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_Home_Internet.rst
-share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_telefon_a_Internet_180_+_660.rst
-share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_telefon_a_Internet_90_+_300.rst
-share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_telefon_universal.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/Estonia/Eesti_Telefon.rst
-share/apps/kppp/Rules/Finland/VLP.rst
-share/apps/kppp/Rules/France/Cegetel_Local.rst
-share/apps/kppp/Rules/France/Cegetel_National.rst
-share/apps/kppp/Rules/France/France_Telecom_Local.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/France/Le_9_Local.rst
-share/apps/kppp/Rules/France/Le_9_National.rst
-share/apps/kppp/Rules/France/OneTel.rst
-share/apps/kppp/Rules/France/Tele2_Local.rst
-share/apps/kppp/Rules/France/Tele2_National.rst
-share/apps/kppp/Rules/France/Wanadoo_Free.rst
-share/apps/kppp/Rules/Germany/1und1_InternetZugang.rst
-share/apps/kppp/Rules/Germany/2.5min.rst
-share/apps/kppp/Rules/Germany/2.5s.rst
-share/apps/kppp/Rules/Germany/AddCom_by_Call.rst
-share/apps/kppp/Rules/Germany/Addcom.rst
-share/apps/kppp/Rules/Germany/Arcor_Internet_by_Call_easy.rst
-share/apps/kppp/Rules/Germany/CallOkaynet.rst
-share/apps/kppp/Rules/Germany/Callino_Surf_Basic.rst
-share/apps/kppp/Rules/Germany/Callino_Surf_Plus.rst
-share/apps/kppp/Rules/Germany/Callisa_City.rst
-share/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst
-share/apps/kppp/Rules/Germany/Cityweb.rst
-share/apps/kppp/Rules/Germany/CompuservePro.rst
-share/apps/kppp/Rules/Germany/E-Plus-Online_Jedermann.rst
-share/apps/kppp/Rules/Germany/Easynet_easy-call.rst
-share/apps/kppp/Rules/Germany/Freenet_Enterprise.rst
-share/apps/kppp/Rules/Germany/Freenet_Sorglos.rst
-share/apps/kppp/Rules/Germany/Freenet_StandardTarif.rst
-share/apps/kppp/Rules/Germany/Freenet_Super_CbC.rst
-share/apps/kppp/Rules/Germany/Freenet_special_call_by_call.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/Netcom_Kassel.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/Puretec.rst
-share/apps/kppp/Rules/Germany/Telekom_City_Select_5_30.rst
-share/apps/kppp/Rules/Germany/VR-Web.rst
-share/apps/kppp/Rules/Germany/expressnet.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_in_euro.rst
-share/apps/kppp/Rules/Greece/Hellas_EPAK_Zone2_in_euro.rst
-share/apps/kppp/Rules/Greece/Hellas_EPAK_local_in_euro.rst
-share/apps/kppp/Rules/Greece/Hellas_analog_local_in_euro.rst
-share/apps/kppp/Rules/Greece/Hellas_digital_local_in_euro.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/Hungary/PapaTel.rst
-share/apps/kppp/Rules/Iceland/Iceland_general.rst
-share/apps/kppp/Rules/India/BSNL_Local.rst
-share/apps/kppp/Rules/India/BSNL_Long_101_To_200.rst
-share/apps/kppp/Rules/India/BSNL_Medium_51_To_100.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/Infostrada_Internet_SpZero.rst
-share/apps/kppp/Rules/Italy/Infostrada_Libero1055_Base.rst
-share/apps/kppp/Rules/Italy/Infostrada_Libero1055_SpZero.rst
-share/apps/kppp/Rules/Italy/Infostrada_Loc_Reg_Naz_SpZero.rst
-share/apps/kppp/Rules/Italy/Infostrada_Locali_Base.rst
-share/apps/kppp/Rules/Italy/Infostrada_Reg_Naz_Base.rst
-share/apps/kppp/Rules/Italy/Telecom_Interurbane_Fino15Km.rst
-share/apps/kppp/Rules/Italy/Telecom_Interurbane_Oltre15Km.rst
-share/apps/kppp/Rules/Italy/Telecom_Locali.rst
-share/apps/kppp/Rules/Italy/Teleconomy24_Internet.rst
-share/apps/kppp/Rules/Italy/Teleconomy24_Nazionali.rst
-share/apps/kppp/Rules/Italy/Teleconomy_NoStop_Internet.rst
-share/apps/kppp/Rules/Italy/Wind_24ore_Internet_AltriISP.rst
-share/apps/kppp/Rules/Italy/Wind_24ore_Internet_InWind.rst
-share/apps/kppp/Rules/Italy/Wind_24ore_Interurbane.rst
-share/apps/kppp/Rules/Italy/Wind_24ore_Urbane.rst
-share/apps/kppp/Rules/Italy/Wind_Family+SuperLight_Internet_InWind.rst
-share/apps/kppp/Rules/Italy/Wind_Family+SuperLight_Urbane_Interurbane.rst
-share/apps/kppp/Rules/Italy/Wind_Family_Internet_AltriISP.rst
-share/apps/kppp/Rules/Italy/Wind_Family_Internet_InWind.rst
-share/apps/kppp/Rules/Italy/Wind_Family_Interurbane.rst
-share/apps/kppp/Rules/Italy/Wind_Family_Urbane.rst
-share/apps/kppp/Rules/Italy/Wind_Flat_Internet_AltriISP.rst
-share/apps/kppp/Rules/Italy/Wind_Flat_Internet_InWind.rst
-share/apps/kppp/Rules/Italy/Wind_Urbana_1088_Light.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/Macedonia/Macedonia_GenericISP_interurban.rst
-share/apps/kppp/Rules/Macedonia/Macedonia_GenericISP_local.rst
-share/apps/kppp/Rules/Macedonia/Macedonia_MTnet.rst
-share/apps/kppp/Rules/Malaysia/TMNet_Jaring.rst
-share/apps/kppp/Rules/Malaysia/malaysia.rst
-share/apps/kppp/Rules/Netherlands/12Move.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_Regio.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/Cistron
-share/apps/kppp/Rules/Netherlands/Freeler_Basis.rst
-share/apps/kppp/Rules/Netherlands/Freeler_Voordelig.rst
-share/apps/kppp/Rules/Netherlands/HetNet_Regelmatig_Surfen.rst
-share/apps/kppp/Rules/Netherlands/InterNLnet.rst
-share/apps/kppp/Rules/Netherlands/OneTel_Spaarstand_Buiten_Regio.rst
-share/apps/kppp/Rules/Netherlands/OneTel_Spaarstand_Regio.rst
-share/apps/kppp/Rules/Netherlands/OneTel_Toets_1658_Buiten_Regio.rst
-share/apps/kppp/Rules/Netherlands/OneTel_Toets_1658_Regio.rst
-share/apps/kppp/Rules/Netherlands/Planet_Internet.rst
-share/apps/kppp/Rules/Netherlands/Priority_Telecom_Nationaal.rst
-share/apps/kppp/Rules/Netherlands/Priority_Telecom_Regionaal.rst
-share/apps/kppp/Rules/Netherlands/Tele2_Extra_Buiten_Regio.rst
-share/apps/kppp/Rules/Netherlands/Tele2_Extra_Regio.rst
-share/apps/kppp/Rules/Netherlands/Tele2_Preselect_Buiten_Regio.rst
-share/apps/kppp/Rules/Netherlands/Tele2_Preselect_Regio.rst
-share/apps/kppp/Rules/Netherlands/Tele2_Toets_1609_Buiten_Regio.rst
-share/apps/kppp/Rules/Netherlands/Tele2_Toets_1609_Regio.rst
-share/apps/kppp/Rules/Netherlands/Wannadoo_Budget_Plus
-share/apps/kppp/Rules/Norway/Local_Area.rst
-share/apps/kppp/Rules/Norway/Long_Distance.rst
-share/apps/kppp/Rules/Norway/Netcom.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/Easynet.rst
-share/apps/kppp/Rules/Romania/RomTelecom_GSM.rst
-share/apps/kppp/Rules/Romania/Romtelecom_Acces_Special_Internet.rst
-share/apps/kppp/Rules/Romania/Romtelecom_Interjudetean.rst
-share/apps/kppp/Rules/Romania/Romtelecom_Local.rst
-share/apps/kppp/Rules/Romania/Zapp-Mobile.rst
-share/apps/kppp/Rules/Russia/TEMPLATE.ru
-share/apps/kppp/Rules/Russia/mtu-intel_standart.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.rst
-share/apps/kppp/Rules/Slovakia/ST_mesto.rst
-share/apps/kppp/Rules/Slovenia/omrezje_0880.rst
-share/apps/kppp/Rules/Slovenia/omrezje_0889.rst
-share/apps/kppp/Rules/Slovenia/stacionarno_omrezje.rst
-share/apps/kppp/Rules/South_Africa/South_Africa_local.rst
-share/apps/kppp/Rules/South_Africa/South_Africa_long_distance.rst
-share/apps/kppp/Rules/South_Afrika/South_Afrika.rst
-share/apps/kppp/Rules/South_Afrika/South_Afrika_Justin.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/Tiscali.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_Freetime.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/Turkey/Turk_Telekom_Internet.rst
-share/apps/kppp/Rules/Ukraine/IPTelecom_hourly.rst
-share/apps/kppp/Rules/Ukraine/NuVse_hourly.rst
-share/apps/kppp/Rules/Ukraine/TEMPLATE.uk
-share/apps/kppp/Rules/Ukraine/Utel_Unet.rst
-share/apps/kppp/Rules/United_Kingdom/BirminghamCable_Local.rst
-share/apps/kppp/Rules/United_Kingdom/BirminghamCable_National.rst
-share/apps/kppp/Rules/United_Kingdom/BirminghamCable_SameTelco.rst
-share/apps/kppp/Rules/United_Kingdom/BritishTelecom_Local.rst
-share/apps/kppp/Rules/United_Kingdom/BritishTelecom_National.rst
-share/apps/kppp/Rules/United_Kingdom/BritishTelecom_Regional.rst
-share/apps/kppp/Rules/United_Kingdom/British_OneTel.rst
-share/apps/kppp/Rules/United_Kingdom/Connaught_Telecom.rst
-share/apps/kppp/Rules/Uruguay/Adinet_cIVA.rst
-share/apps/kppp/Rules/Yugoslavia/041_1xx_xxx.rst
-share/apps/kppp/Rules/Yugoslavia/041_2xx_xxx.rst
-share/apps/kppp/Rules/Yugoslavia/041_3xx_xxx.rst
-share/apps/kppp/Rules/Yugoslavia/041_4xx_xxx.rst
-share/apps/kppp/Rules/Yugoslavia/041_5xx_xxx.rst
-share/apps/kppp/Rules/Yugoslavia/041_9xx_xxx.rst
-share/apps/kppp/Rules/Yugoslavia/III_zona-preko_200km.rst
-share/apps/kppp/Rules/Yugoslavia/II_zona-do_200km.rst
-share/apps/kppp/Rules/Yugoslavia/I_zona-ista_mreza.rst
-share/apps/kppp/Rules/Yugoslavia/Lokalni_poziv.rst
-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/krdc/pics/close.png
-share/apps/krdc/pics/iconify.png
-share/apps/krdc/pics/pindown.png
-share/apps/krdc/pics/pinup.png
-share/apps/krdc/pics/pointcursor.png
-share/apps/krdc/pics/pointcursormask.png
-share/apps/krdc/rdp-keymaps/ar
-share/apps/krdc/rdp-keymaps/common
-share/apps/krdc/rdp-keymaps/da
-share/apps/krdc/rdp-keymaps/de
-share/apps/krdc/rdp-keymaps/en-gb
-share/apps/krdc/rdp-keymaps/en-us
-share/apps/krdc/rdp-keymaps/es
-share/apps/krdc/rdp-keymaps/fi
-share/apps/krdc/rdp-keymaps/fr
-share/apps/krdc/rdp-keymaps/fr-be
-share/apps/krdc/rdp-keymaps/hr
-share/apps/krdc/rdp-keymaps/hu
-share/apps/krdc/rdp-keymaps/it
-share/apps/krdc/rdp-keymaps/ja
-share/apps/krdc/rdp-keymaps/lt
-share/apps/krdc/rdp-keymaps/lv
-share/apps/krdc/rdp-keymaps/mk
-share/apps/krdc/rdp-keymaps/modifiers
-share/apps/krdc/rdp-keymaps/no
-share/apps/krdc/rdp-keymaps/pl
-share/apps/krdc/rdp-keymaps/pt
-share/apps/krdc/rdp-keymaps/pt-br
-share/apps/krdc/rdp-keymaps/ru
-share/apps/krdc/rdp-keymaps/sl
-share/apps/krdc/rdp-keymaps/sv
-share/apps/krdc/rdp-keymaps/th
-share/apps/krdc/rdp-keymaps/tr
-share/apps/krfb/eventsrc
-share/apps/krfb/pics/connection-side-image.png
-share/apps/krfb/pics/eyes-closed24.png
-share/apps/krfb/pics/eyes-open24.png
-share/apps/ksirc/autodcc.pl
-share/apps/ksirc/eventsrc
-share/apps/ksirc/filters.pl
-share/apps/ksirc/icons/crystalsvg/16x16/apps/ksirc.png
-share/apps/ksirc/icons/crystalsvg/22x22/actions/info.png
-share/apps/ksirc/icons/crystalsvg/22x22/actions/ksirc_dock.png
-share/apps/ksirc/icons/crystalsvg/32x32/apps/ksirc.png
-share/apps/ksirc/icons/crystalsvg/48x48/apps/ksirc.png
-share/apps/ksirc/icons/crystalsvg/64x64/apps/ksirc.png
-share/apps/ksirc/ksirc.pl
-share/apps/ksirc/pics/X.png
-share/apps/ksirc/pics/action.png
-share/apps/ksirc/pics/arrow.png
-share/apps/ksirc/pics/blueball.png
-share/apps/ksirc/pics/bluepin.png
-share/apps/ksirc/pics/bminus.png
-share/apps/ksirc/pics/bplus.png
-share/apps/ksirc/pics/channel.xpm
-share/apps/ksirc/pics/channels.xpm
-share/apps/ksirc/pics/ctcpping.png
-share/apps/ksirc/pics/dcc.png
-share/apps/ksirc/pics/dccget.png
-share/apps/ksirc/pics/dccsend.png
-share/apps/ksirc/pics/elipsis.png
-share/apps/ksirc/pics/emoticons/biggrin.png
-share/apps/ksirc/pics/emoticons/clown.png
-share/apps/ksirc/pics/emoticons/cry.png
-share/apps/ksirc/pics/emoticons/devil.png
-share/apps/ksirc/pics/emoticons/frown.png
-share/apps/ksirc/pics/emoticons/heart.png
-share/apps/ksirc/pics/emoticons/loveit.png
-share/apps/ksirc/pics/emoticons/puh.png
-share/apps/ksirc/pics/emoticons/puh2.png
-share/apps/ksirc/pics/emoticons/redface.png
-share/apps/ksirc/pics/emoticons/sadley.png
-share/apps/ksirc/pics/emoticons/slime.png
-share/apps/ksirc/pics/emoticons/smile.png
-share/apps/ksirc/pics/emoticons/wink.png
-share/apps/ksirc/pics/emoticons/yummie.png
-share/apps/ksirc/pics/error.png
-share/apps/ksirc/pics/greenpin.png
-share/apps/ksirc/pics/info.png
-share/apps/ksirc/pics/info1.png
-share/apps/ksirc/pics/join.png
-share/apps/ksirc/pics/kick.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/madsmiley.png
-share/apps/ksirc/pics/mdi.png
-share/apps/ksirc/pics/mini-run.png
-share/apps/ksirc/pics/minus.png
-share/apps/ksirc/pics/mode.png
-share/apps/ksirc/pics/notice.png
-share/apps/ksirc/pics/ominus.png
-share/apps/ksirc/pics/oplus.png
-share/apps/ksirc/pics/part.png
-share/apps/ksirc/pics/plus.png
-share/apps/ksirc/pics/quit.png
-share/apps/ksirc/pics/sadsmiley.png
-share/apps/ksirc/pics/sdi.png
-share/apps/ksirc/pics/server.xpm
-share/apps/ksirc/pics/servinfo.png
-share/apps/ksirc/pics/smiley.png
-share/apps/ksirc/pics/star.png
-share/apps/ksirc/pics/topic.png
-share/apps/ksirc/relnotes
-share/apps/ksirc/servers.ini
-share/apps/ksirc/servers.txt
-share/apps/ksirc/sirc.help.gz
-share/apps/lisa/README
-share/config/ksircrc
-share/doc/HTML/en/kcontrol/kcmtalkd/common
-share/doc/HTML/en/kcontrol/kcmtalkd/index.cache.bz2
-share/doc/HTML/en/kcontrol/kcmtalkd/index.docbook
-share/doc/HTML/en/kcontrol/lanbrowser/common
-share/doc/HTML/en/kcontrol/lanbrowser/index.cache.bz2
-share/doc/HTML/en/kcontrol/lanbrowser/index.docbook
-share/doc/HTML/en/kdict/applet.png
-share/doc/HTML/en/kdict/common
-share/doc/HTML/en/kdict/conf.png
-share/doc/HTML/en/kdict/index.cache.bz2
-share/doc/HTML/en/kdict/index.docbook
-share/doc/HTML/en/kdict/mainwin.png
-share/doc/HTML/en/kdict/seteditor.png
-share/doc/HTML/en/kget/common
-share/doc/HTML/en/kget/cr22-action-tool_delay.png
-share/doc/HTML/en/kget/cr22-action-tool_delete.png
-share/doc/HTML/en/kget/cr22-action-tool_disconnect.png
-share/doc/HTML/en/kget/cr22-action-tool_drop_target.png
-share/doc/HTML/en/kget/cr22-action-tool_expert.png
-share/doc/HTML/en/kget/cr22-action-tool_logwindow.png
-share/doc/HTML/en/kget/cr22-action-tool_offline_mode_off.png
-share/doc/HTML/en/kget/cr22-action-tool_offline_mode_on.png
-share/doc/HTML/en/kget/cr22-action-tool_paste.png
-share/doc/HTML/en/kget/cr22-action-tool_pause.png
-share/doc/HTML/en/kget/cr22-action-tool_queue.png
-share/doc/HTML/en/kget/cr22-action-tool_restart.png
-share/doc/HTML/en/kget/cr22-action-tool_resume.png
-share/doc/HTML/en/kget/cr22-action-tool_shutdown.png
-share/doc/HTML/en/kget/cr22-action-tool_timer.png
-share/doc/HTML/en/kget/cr22-action-tool_uselastdir.png
-share/doc/HTML/en/kget/fileopen.png
-share/doc/HTML/en/kget/index.cache.bz2
-share/doc/HTML/en/kget/index.docbook
-share/doc/HTML/en/kget/kget1.png
-share/doc/HTML/en/kget/kget2.png
-share/doc/HTML/en/kget/kget3.png
-share/doc/HTML/en/kget/kget4.png
-share/doc/HTML/en/kget/kget5.png
-share/doc/HTML/en/knewsticker/TODO
-share/doc/HTML/en/knewsticker/about-icon.png
-share/doc/HTML/en/knewsticker/checknews-icon.png
-share/doc/HTML/en/knewsticker/common
-share/doc/HTML/en/knewsticker/contextmenu.png
-share/doc/HTML/en/knewsticker/help-icon.png
-share/doc/HTML/en/knewsticker/index.cache.bz2
-share/doc/HTML/en/knewsticker/index.docbook
-share/doc/HTML/en/knewsticker/kcmnewsticker-filters.png
-share/doc/HTML/en/knewsticker/kcmnewsticker-general.png
-share/doc/HTML/en/knewsticker/kcmnewsticker-newssitedialog.png
-share/doc/HTML/en/knewsticker/kcmnewsticker-newssources.png
-share/doc/HTML/en/knewsticker/kcmnewsticker-scrollerprefs.png
-share/doc/HTML/en/knewsticker/kcontrol-icon.png
-share/doc/HTML/en/knewsticker/knewsticker-childpanel.png
-share/doc/HTML/en/knewsticker/knewsticker-icon.png
-share/doc/HTML/en/knewsticker/knewsticker-kicker.png
-share/doc/HTML/en/knewsticker/knewsticker-ownwindow.png
-share/doc/HTML/en/knewsticker/newarticle-icon.png
-share/doc/HTML/en/knewsticker/newssite-icon.png
-share/doc/HTML/en/knewsticker/oldarticle-icon.png
-share/doc/HTML/en/knewsticker/preferences-icon.png
-share/doc/HTML/en/kopete/common
-share/doc/HTML/en/kopete/index.cache.bz2
-share/doc/HTML/en/kopete/index.docbook
-share/doc/HTML/en/kpf/common
-share/doc/HTML/en/kpf/index.cache.bz2
-share/doc/HTML/en/kpf/index.docbook
-share/doc/HTML/en/kppp/accounting.docbook
-share/doc/HTML/en/kppp/callback.docbook
-share/doc/HTML/en/kppp/chap.docbook
-share/doc/HTML/en/kppp/common
-share/doc/HTML/en/kppp/costsgraphs.fig
-share/doc/HTML/en/kppp/costsgraphs.png
-share/doc/HTML/en/kppp/dialog-setup.docbook
-share/doc/HTML/en/kppp/getting-online.docbook
-share/doc/HTML/en/kppp/global-settings.docbook
-share/doc/HTML/en/kppp/hayes.docbook
-share/doc/HTML/en/kppp/index.cache.bz2
-share/doc/HTML/en/kppp/index.docbook
-share/doc/HTML/en/kppp/kppp-account-accounting-tab.png
-share/doc/HTML/en/kppp/kppp-account-dial-tab.png
-share/doc/HTML/en/kppp/kppp-account-dns-tab.png
-share/doc/HTML/en/kppp/kppp-account-execute-tab.png
-share/doc/HTML/en/kppp/kppp-account-gateway-tab.png
-share/doc/HTML/en/kppp/kppp-account-ip-tab.png
-share/doc/HTML/en/kppp/kppp-account-login-script-tab.png
-share/doc/HTML/en/kppp/kppp-config.png
-share/doc/HTML/en/kppp/kppp-device-tab.png
-share/doc/HTML/en/kppp/kppp-dialler-tab.png
-share/doc/HTML/en/kppp/kppp-faq.docbook
-share/doc/HTML/en/kppp/kppp-graph-tab.png
-share/doc/HTML/en/kppp/kppp-misc-tab.png
-share/doc/HTML/en/kppp/kppp-modem-tab.png
-share/doc/HTML/en/kppp/kppp-wizard.png
-share/doc/HTML/en/kppp/kppp.faq.question
-share/doc/HTML/en/kppp/security.docbook
-share/doc/HTML/en/kppp/tricks.docbook
-share/doc/HTML/en/kppp/ttyS-cua.txt
-share/doc/HTML/en/kppp/wizard.docbook
-share/doc/HTML/en/krdc/authentication.eps
-share/doc/HTML/en/krdc/authentication.png
-share/doc/HTML/en/krdc/close.png
-share/doc/HTML/en/krdc/common
-share/doc/HTML/en/krdc/index.cache.bz2
-share/doc/HTML/en/krdc/index.docbook
-share/doc/HTML/en/krdc/krdc_window.eps
-share/doc/HTML/en/krdc/krdc_window.png
-share/doc/HTML/en/krdc/preferences_profilestab.eps
-share/doc/HTML/en/krdc/preferences_profilestab.png
-share/doc/HTML/en/krdc/preferences_rdpdefaultstab.eps
-share/doc/HTML/en/krdc/preferences_rdpdefaultstab.png
-share/doc/HTML/en/krdc/preferences_vncdefaultstab.eps
-share/doc/HTML/en/krdc/preferences_vncdefaultstab.png
-share/doc/HTML/en/krdc/snapshot.eps
-share/doc/HTML/en/krdc/snapshot.png
-share/doc/HTML/en/krdc/snapshot_connectionspeed.eps
-share/doc/HTML/en/krdc/snapshot_connectionspeed.png
-share/doc/HTML/en/krdc/snapshot_nobrowse.eps
-share/doc/HTML/en/krdc/snapshot_nobrowse.png
-share/doc/HTML/en/krdc/snapshot_vncentry.eps
-share/doc/HTML/en/krdc/snapshot_vncentry.png
-share/doc/HTML/en/krdc/window_fullscreen.png
-share/doc/HTML/en/krdc/window_nofullscreen.png
-share/doc/HTML/en/krfb/common
-share/doc/HTML/en/krfb/configuration_access.eps
-share/doc/HTML/en/krfb/configuration_access.png
-share/doc/HTML/en/krfb/configuration_network.eps
-share/doc/HTML/en/krfb/configuration_network.png
-share/doc/HTML/en/krfb/configuration_session.eps
-share/doc/HTML/en/krfb/configuration_session.png
-share/doc/HTML/en/krfb/connection.eps
-share/doc/HTML/en/krfb/connection.png
-share/doc/HTML/en/krfb/email_invitation.eps
-share/doc/HTML/en/krfb/email_invitation.png
-share/doc/HTML/en/krfb/index.cache.bz2
-share/doc/HTML/en/krfb/index.docbook
-share/doc/HTML/en/krfb/invitation_management.eps
-share/doc/HTML/en/krfb/invitation_management.png
-share/doc/HTML/en/krfb/personal_invitation.eps
-share/doc/HTML/en/krfb/personal_invitation.png
-share/doc/HTML/en/krfb/screenshot.eps
-share/doc/HTML/en/krfb/screenshot.png
-share/doc/HTML/en/ksirc/common
-share/doc/HTML/en/ksirc/index.cache.bz2
-share/doc/HTML/en/ksirc/index.docbook
-share/doc/HTML/en/ktalkd/common
-share/doc/HTML/en/ktalkd/index.cache.bz2
-share/doc/HTML/en/ktalkd/index.docbook
-share/doc/HTML/en/kwifimanager/common
-share/doc/HTML/en/kwifimanager/index.cache.bz2
-share/doc/HTML/en/kwifimanager/index.docbook
-share/doc/HTML/en/lisa/common
-share/doc/HTML/en/lisa/index.cache.bz2
-share/doc/HTML/en/lisa/index.docbook
-share/icons/crystalsvg/128x128/apps/kdict.png
-share/icons/crystalsvg/128x128/apps/kopete.png
-share/icons/crystalsvg/128x128/apps/kppp.png
-share/icons/crystalsvg/16x16/apps/kdict.png
-share/icons/crystalsvg/16x16/apps/knewsticker.png
-share/icons/crystalsvg/16x16/apps/kopete.png
-share/icons/crystalsvg/16x16/apps/kpf.png
-share/icons/crystalsvg/16x16/apps/kppp.png
-share/icons/crystalsvg/16x16/apps/ksirc.png
-share/icons/crystalsvg/22x22/actions/khtml_kget.png
-share/icons/crystalsvg/22x22/apps/kopete.png
-share/icons/crystalsvg/32x32/apps/kdict.png
-share/icons/crystalsvg/32x32/apps/knewsticker.png
-share/icons/crystalsvg/32x32/apps/kopete.png
-share/icons/crystalsvg/32x32/apps/kpf.png
-share/icons/crystalsvg/32x32/apps/kppp.png
-share/icons/crystalsvg/32x32/apps/krdc.png
-share/icons/crystalsvg/32x32/apps/krfb.png
-share/icons/crystalsvg/32x32/apps/ksirc.png
-share/icons/crystalsvg/48x48/apps/kdict.png
-share/icons/crystalsvg/48x48/apps/kget.png
-share/icons/crystalsvg/48x48/apps/knewsticker.png
-share/icons/crystalsvg/48x48/apps/kopete.png
-share/icons/crystalsvg/48x48/apps/kpf.png
-share/icons/crystalsvg/48x48/apps/kppp.png
-share/icons/crystalsvg/48x48/apps/krdc.png
-share/icons/crystalsvg/48x48/apps/krfb.png
-share/icons/crystalsvg/48x48/apps/ksirc.png
-share/icons/crystalsvg/48x48/mimetypes/kget_list.png
-share/icons/crystalsvg/64x64/apps/kdict.png
-share/icons/crystalsvg/64x64/apps/kopete.png
-share/icons/crystalsvg/64x64/apps/kppp.png
-share/icons/crystalsvg/64x64/apps/ksirc.png
-share/icons/locolor/16x16/apps/krfb.png
-share/icons/locolor/32x32/apps/krfb.png
-share/mimelnk/application/x-kgetlist.desktop
-share/services/chatwindow.desktop
-share/services/kconfiguredialog/kopete_autoreplace_config.desktop
-share/services/kconfiguredialog/kopete_cryptography_config.desktop
-share/services/kconfiguredialog/kopete_highlight_config.desktop
-share/services/kconfiguredialog/kopete_history_config.desktop
-share/services/kconfiguredialog/kopete_msn_config.desktop
-share/services/kconfiguredialog/kopete_nowlistening_config.desktop
-share/services/kconfiguredialog/kopete_texteffect_config.desktop
-share/services/kconfiguredialog/kopete_translator_config.desktop
-share/services/kconfiguredialog/kopete_webpresence_config.desktop
-share/services/kded/kinetd.desktop
-share/services/kinetd_krfb.desktop
-share/services/kinetd_krfb_httpd.desktop
-share/services/kntsrcfilepropsdlg.desktop
-share/services/kopete_accountconfig.desktop
-share/services/kopete_aim.desktop
-share/services/kopete_appearanceconfig.desktop
-share/services/kopete_autoreplace.desktop
-share/services/kopete_behaviorconfig.desktop
-share/services/kopete_connectionstatus.desktop
-share/services/kopete_contactnotes.desktop
-share/services/kopete_cryptography.desktop
-share/services/kopete_highlight.desktop
-share/services/kopete_history.desktop
-share/services/kopete_icq.desktop
-share/services/kopete_irc.desktop
-share/services/kopete_jabber.desktop
-share/services/kopete_msn.desktop
-share/services/kopete_nowlistening.desktop
-share/services/kopete_sms.desktop
-share/services/kopete_texteffect.desktop
-share/services/kopete_translator.desktop
-share/services/kopete_webpresence.desktop
-share/services/kopete_yahoo.desktop
-share/services/kpfpropertiesdialogplugin.desktop
-share/services/lan.protocol
-share/services/rdp.protocol
-share/services/rlan.protocol
-share/services/rssservice.desktop
-share/services/vnc.protocol
-share/servicetypes/kinetdmodule.desktop
-share/servicetypes/kopeteplugin.desktop
-share/servicetypes/kopeteprotocol.desktop
-share/servicetypes/kopeteui.desktop
-share/sounds/Kopete_Event.ogg
-share/sounds/Kopete_Received.ogg
-share/sounds/Kopete_Sent.ogg
-share/sounds/Kopete_User_is_Online.ogg
diff --git a/net/kdenetwork4/files/plist.base.rm b/net/kdenetwork4/files/plist.base.rm
deleted file mode 100644
index 13d56686f0eb..000000000000
--- a/net/kdenetwork4/files/plist.base.rm
+++ /dev/null
@@ -1,217 +0,0 @@
-@dirrm share/sounds
-@dirrm share/servicetypes
-@dirrm share/services/kded
-@dirrm share/services/kconfiguredialog
-@dirrm share/services
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/crystalsvg/64x64/apps
-@dirrm share/icons/crystalsvg/64x64
-@dirrm share/icons/crystalsvg/48x48/mimetypes
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
-@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/icons/crystalsvg/22x22/actions
-@dirrm share/icons/crystalsvg/22x22
-@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg/128x128/apps
-@dirrm share/icons/crystalsvg/128x128
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
-@dirrm share/doc/HTML/en/lisa
-@dirrm share/doc/HTML/en/kwifimanager
-@dirrm share/doc/HTML/en/ktalkd
-@dirrm share/doc/HTML/en/ksirc
-@dirrm share/doc/HTML/en/krfb
-@dirrm share/doc/HTML/en/krdc
-@dirrm share/doc/HTML/en/kppp
-@dirrm share/doc/HTML/en/kpf
-@dirrm share/doc/HTML/en/kopete
-@dirrm share/doc/HTML/en/knewsticker
-@dirrm share/doc/HTML/en/kget
-@dirrm share/doc/HTML/en/kdict
-@dirrm share/doc/HTML/en/kcontrol/lanbrowser
-@dirrm share/doc/HTML/en/kcontrol/kcmtalkd
-@dirrm share/doc/HTML/en/kcontrol
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/config
-@dirrm share/apps/lisa
-@dirrm share/apps/ksirc/pics/emoticons
-@dirrm share/apps/ksirc/pics
-@dirrm share/apps/ksirc/icons/crystalsvg/64x64/apps
-@dirrm share/apps/ksirc/icons/crystalsvg/64x64
-@dirrm share/apps/ksirc/icons/crystalsvg/48x48/apps
-@dirrm share/apps/ksirc/icons/crystalsvg/48x48
-@dirrm share/apps/ksirc/icons/crystalsvg/32x32/apps
-@dirrm share/apps/ksirc/icons/crystalsvg/32x32
-@dirrm share/apps/ksirc/icons/crystalsvg/22x22/actions
-@dirrm share/apps/ksirc/icons/crystalsvg/22x22
-@dirrm share/apps/ksirc/icons/crystalsvg/16x16/apps
-@dirrm share/apps/ksirc/icons/crystalsvg/16x16
-@dirrm share/apps/ksirc/icons/crystalsvg
-@dirrm share/apps/ksirc/icons
-@dirrm share/apps/ksirc
-@dirrm share/apps/krfb/pics
-@dirrm share/apps/krfb
-@dirrm share/apps/krdc/rdp-keymaps
-@dirrm share/apps/krdc/pics
-@dirrm share/apps/krdc
-@dirrm share/apps/kppp/pics
-@dirrm share/apps/kppp/Rules/Yugoslavia
-@dirrm share/apps/kppp/Rules/Uruguay
-@dirrm share/apps/kppp/Rules/United_Kingdom
-@dirrm share/apps/kppp/Rules/Ukraine
-@dirrm share/apps/kppp/Rules/Turkey
-@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/South_Africa
-@dirrm share/apps/kppp/Rules/Slovenia
-@dirrm share/apps/kppp/Rules/Slovakia
-@dirrm share/apps/kppp/Rules/Singapore
-@dirrm share/apps/kppp/Rules/Russia
-@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/Macedonia
-@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/Finland
-@dirrm share/apps/kppp/Rules/Estonia
-@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/Bosnia_and_Herzegovina
-@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/Yugoslavia
-@dirrm share/apps/kppp/Provider/United_Kingdom
-@dirrm share/apps/kppp/Provider/Ukraine
-@dirrm share/apps/kppp/Provider/Taiwan
-@dirrm share/apps/kppp/Provider/Switzerland
-@dirrm share/apps/kppp/Provider/Sweden
-@dirrm share/apps/kppp/Provider/Slovenia
-@dirrm share/apps/kppp/Provider/Portugal
-@dirrm share/apps/kppp/Provider/Norway
-@dirrm share/apps/kppp/Provider/NewZealand
-@dirrm share/apps/kppp/Provider/Netherlands
-@dirrm share/apps/kppp/Provider/Irland
-@dirrm share/apps/kppp/Provider/Germany
-@dirrm share/apps/kppp/Provider/France
-@dirrm share/apps/kppp/Provider/Denmark
-@dirrm share/apps/kppp/Provider/Czech_Republic
-@dirrm share/apps/kppp/Provider/Belarus
-@dirrm share/apps/kppp/Provider/Austria
-@dirrm share/apps/kppp/Provider
-@dirrm share/apps/kppp
-@dirrm share/apps/kopeterichtexteditpart
-@dirrm share/apps/kopete_translator
-@dirrm share/apps/kopete_history
-@dirrm share/apps/kopete_cryptography
-@dirrm share/apps/kopete_contactnotes
-@dirrm share/apps/kopete/webpresence
-@dirrm share/apps/kopete/styles
-@dirrm share/apps/kopete/pics/emoticons/tweakers.net
-@dirrm share/apps/kopete/pics/emoticons/phpBB
-@dirrm share/apps/kopete/pics/emoticons/greggman.com
-@dirrm share/apps/kopete/pics/emoticons/ccmathteam.com
-@dirrm share/apps/kopete/pics/emoticons/Yazoo-Smileys-22
-@dirrm share/apps/kopete/pics/emoticons/Yazoo-Smileys-16
-@dirrm share/apps/kopete/pics/emoticons/RedOnes
-@dirrm share/apps/kopete/pics/emoticons/Plain
-@dirrm share/apps/kopete/pics/emoticons/KMess-Violet
-@dirrm share/apps/kopete/pics/emoticons/KMess-Cartoon
-@dirrm share/apps/kopete/pics/emoticons/KMess-Blue
-@dirrm share/apps/kopete/pics/emoticons/KMess
-@dirrm share/apps/kopete/pics/emoticons/Default
-@dirrm share/apps/kopete/pics/emoticons/Boxed
-@dirrm share/apps/kopete/pics/emoticons
-@dirrm share/apps/kopete/pics
-@dirrm share/apps/kopete/icons/crystalsvg/64x64/apps
-@dirrm share/apps/kopete/icons/crystalsvg/64x64
-@dirrm share/apps/kopete/icons/crystalsvg/48x48/apps
-@dirrm share/apps/kopete/icons/crystalsvg/48x48/actions
-@dirrm share/apps/kopete/icons/crystalsvg/48x48
-@dirrm share/apps/kopete/icons/crystalsvg/32x32/apps
-@dirrm share/apps/kopete/icons/crystalsvg/32x32/actions
-@dirrm share/apps/kopete/icons/crystalsvg/32x32
-@dirrm share/apps/kopete/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kopete/icons/crystalsvg/22x22
-@dirrm share/apps/kopete/icons/crystalsvg/16x16/apps
-@dirrm share/apps/kopete/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kopete/icons/crystalsvg/16x16
-@dirrm share/apps/kopete/icons/crystalsvg/128x128/apps
-@dirrm share/apps/kopete/icons/crystalsvg/128x128
-@dirrm share/apps/kopete/icons/crystalsvg
-@dirrm share/apps/kopete/icons
-@dirrm share/apps/kopete
-@dirrm share/apps/konqueror/dirtree/remote
-@dirrm share/apps/konqueror/dirtree
-@dirrm share/apps/konqueror
-@dirrm share/apps/knewsticker
-@dirrm share/apps/kinetd
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
-@dirrm share/apps/khtml/kpartplugins
-@dirrm share/apps/khtml
-@dirrm share/apps/kget/sounds
-@dirrm share/apps/kget/pics
-@dirrm share/apps/kget/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kget/icons/crystalsvg/22x22
-@dirrm share/apps/kget/icons/crystalsvg
-@dirrm share/apps/kget/icons
-@dirrm share/apps/kget
-@dirrm share/apps/kdict/icons/crystalsvg/32x32/actions
-@dirrm share/apps/kdict/icons/crystalsvg/32x32
-@dirrm share/apps/kdict/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kdict/icons/crystalsvg/22x22
-@dirrm share/apps/kdict/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kdict/icons/crystalsvg/16x16
-@dirrm share/apps/kdict/icons/crystalsvg
-@dirrm share/apps/kdict/icons
-@dirrm share/apps/kdict
-@dirrm share/apps/kconf_update
-@dirrm share/apps
-@dirrm share/applnk/Internet
-@dirrm share/applnk/.hidden
-@dirrm share/applnk
-@dirrm share/applications/kde
-@dirrm share/applications
-@dirrm lib/kde3
-@dirrm lib/kconf_update_bin
-@dirrm include/rss
diff --git a/net/kdenetwork4/files/plist.ktalkd b/net/kdenetwork4/files/plist.ktalkd
deleted file mode 100644
index c61949a945ea..000000000000
--- a/net/kdenetwork4/files/plist.ktalkd
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/ktalkd
-bin/ktalkdlg
-bin/mail.local
-lib/kde3/kcm_ktalkd.la
-lib/kde3/kcm_ktalkd.so
-share/applications/kde/kcmktalkd.desktop
-share/config/ktalkdrc
-share/icons/crystalsvg/128x128/apps/ktalkd.png
-share/icons/crystalsvg/16x16/apps/ktalkd.png
-share/icons/crystalsvg/32x32/apps/ktalkd.png
-share/icons/crystalsvg/48x48/apps/ktalkd.png
-share/sounds/ktalkd.wav
diff --git a/net/kdenetwork4/files/plist.ktalkd.rm b/net/kdenetwork4/files/plist.ktalkd.rm
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net/kdenetwork4/files/plist.ktalkd.rm
+++ /dev/null
diff --git a/net/kdenetwork4/pkg-descr b/net/kdenetwork4/pkg-descr
deleted file mode 100644
index 930132bfb9a4..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 networking things like kppp,
-ksirc (irc-client), KDE's instant messenger kopete, and so forth.
-
-WWW: http://www.kde.org/
diff --git a/net/lam7/Makefile b/net/lam7/Makefile
deleted file mode 100644
index aa9741146517..000000000000
--- a/net/lam7/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for:		lam
-# Date created:					Aug 21 2001
-# Whom:						bremner@unb.ca
-#
-# $FreeBSD$
-#
-
-PORTNAME=      	lam
-PORTVERSION=   	6.5.9
-CATEGORIES=    	net parallel
-MASTER_SITES=  	http://www.lam-mpi.org/download/files/
-
-MAINTAINER=    	bremner@unb.ca
-COMMENT=	Local Area Multicomputer MPI implementation
-
-USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-rsh=ssh
-
-.include "files/manpages"
-
-.include <bsd.port.mk>
diff --git a/net/lam7/distinfo b/net/lam7/distinfo
deleted file mode 100644
index e25c95c0229c..000000000000
--- a/net/lam7/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (lam-6.5.9.tar.bz2) = 8a4e98da5e1ba41e68c9422635b42364
-SIZE (lam-6.5.9.tar.bz2) = 1642559
diff --git a/net/lam7/files/manpages b/net/lam7/files/manpages
deleted file mode 100644
index d15c9ae26cb6..000000000000
--- a/net/lam7/files/manpages
+++ /dev/null
@@ -1,339 +0,0 @@
-MAN1= \
-hboot.1 \
-hcc.1 \
-hcp.1 \
-hf77.1 \
-introu.1 \
-lamboot.1 \
-lamclean.1 \
-lamd.1 \
-lamexec.1 \
-lamgrow.1 \
-lamshrink.1 \
-lamtrace.1 \
-mpiCC.1 \
-mpic++.1 \
-mpicc.1 \
-mpif77.1 \
-mpimsg.1 \
-mpirun.1 \
-mpitask.1 \
-recon.1 \
-tkill.1 \
-tping.1 \
-wipe.1
-
-MAN3= \
-MPIL_Comm_gps.3 \
-MPIL_Comm_id.3 \
-MPIL_Comm_parent.3 \
-MPIL_Signal.3 \
-MPIL_Spawn.3 \
-MPIL_Trace_off.3 \
-MPIL_Trace_on.3 \
-MPIL_Type_id.3 \
-MPIL_Universe_size.3 \
-MPIO_Request_c2f.3 \
-MPIO_Request_f2c.3 \
-MPIO_Test.3 \
-MPIO_Wait.3 \
-MPI_Abort.3 \
-MPI_Accumulate.3 \
-MPI_Address.3 \
-MPI_Allgather.3 \
-MPI_Allgatherv.3 \
-MPI_Alloc_mem.3 \
-MPI_Allreduce.3 \
-MPI_Alltoall.3 \
-MPI_Alltoallv.3 \
-MPI_Attr_delete.3 \
-MPI_Attr_get.3 \
-MPI_Attr_put.3 \
-MPI_Barrier.3 \
-MPI_Bcast.3 \
-MPI_Bsend.3 \
-MPI_Bsend_init.3 \
-MPI_Buffer_attach.3 \
-MPI_Buffer_detach.3 \
-MPI_COMM_DUP_FN.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_Close_port.3 \
-MPI_Comm_accept.3 \
-MPI_Comm_c2f.3 \
-MPI_Comm_compare.3 \
-MPI_Comm_connect.3 \
-MPI_Comm_create.3 \
-MPI_Comm_create_errhandler.3 \
-MPI_Comm_create_keyval.3 \
-MPI_Comm_delete_attr.3 \
-MPI_Comm_disconnect.3 \
-MPI_Comm_dup.3 \
-MPI_Comm_f2c.3 \
-MPI_Comm_free.3 \
-MPI_Comm_free_keyval.3 \
-MPI_Comm_get_attr.3 \
-MPI_Comm_get_errhandler.3 \
-MPI_Comm_get_name.3 \
-MPI_Comm_get_parent.3 \
-MPI_Comm_group.3 \
-MPI_Comm_join.3 \
-MPI_Comm_rank.3 \
-MPI_Comm_remote_group.3 \
-MPI_Comm_remote_size.3 \
-MPI_Comm_ser_errhandler.3 \
-MPI_Comm_set_attr.3 \
-MPI_Comm_set_name.3 \
-MPI_Comm_size.3 \
-MPI_Comm_spawn.3 \
-MPI_Comm_spawn_multiple.3 \
-MPI_Comm_split.3 \
-MPI_Comm_test_inter.3 \
-MPI_DUP_FN.3 \
-MPI_Dims_create.3 \
-MPI_Errhandler_c2f.3 \
-MPI_Errhandler_create.3 \
-MPI_Errhandler_f2c.3 \
-MPI_Errhandler_free.3 \
-MPI_Errhandler_get.3 \
-MPI_Errhandler_set.3 \
-MPI_Error_class.3 \
-MPI_Error_string.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_errhandler.3 \
-MPI_File_get_group.3 \
-MPI_File_get_info.3 \
-MPI_File_get_position.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_preallocate.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_begin.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_errhandler.3 \
-MPI_File_set_info.3 \
-MPI_File_set_size.3 \
-MPI_File_set_view.3 \
-MPI_File_sync.3 \
-MPI_File_write.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_begin.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_Finalize.3 \
-MPI_Finalized.3 \
-MPI_Free_mem.3 \
-MPI_Gather.3 \
-MPI_Gatherv.3 \
-MPI_Get.3 \
-MPI_Get_address.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_c2f.3 \
-MPI_Group_compare.3 \
-MPI_Group_difference.3 \
-MPI_Group_excl.3 \
-MPI_Group_f2c.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_Ibsend.3 \
-MPI_Info_c2f.3 \
-MPI_Info_create.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_nthkey.3 \
-MPI_Info_get_valuelen.3 \
-MPI_Info_set.3 \
-MPI_Init.3 \
-MPI_Init_thread.3 \
-MPI_Initialized.3 \
-MPI_Intercomm_create.3 \
-MPI_Intercomm_merge.3 \
-MPI_Iprobe.3 \
-MPI_Irecv.3 \
-MPI_Irsend.3 \
-MPI_Is_thread_main.3 \
-MPI_Isend.3 \
-MPI_Issend.3 \
-MPI_Keyval_create.3 \
-MPI_Keyval_free.3 \
-MPI_Lookup_name.3 \
-MPI_Op_c2f.3 \
-MPI_Op_create.3 \
-MPI_Op_f2c.3 \
-MPI_Op_free.3 \
-MPI_Open_port.3 \
-MPI_Pack.3 \
-MPI_Pack_size.3 \
-MPI_Pcontrol.3 \
-MPI_Probe.3 \
-MPI_Publish_name.3 \
-MPI_Put.3 \
-MPI_Query_thread.3 \
-MPI_Recv.3 \
-MPI_Recv_init.3 \
-MPI_Reduce.3 \
-MPI_Reduce_scatter.3 \
-MPI_Request_c2f.3 \
-MPI_Request_f2c.3 \
-MPI_Request_free.3 \
-MPI_Rsend.3 \
-MPI_Rsend_init.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_f2c.3 \
-MPI_TYPE_DUP_FN.3 \
-MPI_Test.3 \
-MPI_Test_cancelled.3 \
-MPI_Testall.3 \
-MPI_Testany.3 \
-MPI_Testsome.3 \
-MPI_Topo_test.3 \
-MPI_Type_c2f.3 \
-MPI_Type_commit.3 \
-MPI_Type_contiguous.3 \
-MPI_Type_create_darray.3 \
-MPI_Type_create_extent.3 \
-MPI_Type_create_hindexed.3 \
-MPI_Type_create_hvector.3 \
-MPI_Type_create_keyval.3 \
-MPI_Type_create_struct.3 \
-MPI_Type_create_subarray.3 \
-MPI_Type_delete_attr.3 \
-MPI_Type_dup.3 \
-MPI_Type_extent.3 \
-MPI_Type_f2c.3 \
-MPI_Type_free.3 \
-MPI_Type_free_keyval.3 \
-MPI_Type_get_attr.3 \
-MPI_Type_get_contents.3 \
-MPI_Type_get_envelope.3 \
-MPI_Type_get_extent.3 \
-MPI_Type_get_name.3 \
-MPI_Type_get_true_extent.3 \
-MPI_Type_hindexed.3 \
-MPI_Type_hvector.3 \
-MPI_Type_indexed.3 \
-MPI_Type_lb.3 \
-MPI_Type_set_attr.3 \
-MPI_Type_set_name.3 \
-MPI_Type_size.3 \
-MPI_Type_struct.3 \
-MPI_Type_ub.3 \
-MPI_Type_vector.3 \
-MPI_Unpack.3 \
-MPI_WIN_DUP_FN.3 \
-MPI_Wait.3 \
-MPI_Waitall.3 \
-MPI_Waitany.3 \
-MPI_Waitsome.3 \
-MPI_Win_c2f.3 \
-MPI_Win_complete.3 \
-MPI_Win_create.3 \
-MPI_Win_create_errhandler.3 \
-MPI_Win_create_keyval.3 \
-MPI_Win_delete_attr.3 \
-MPI_Win_f2c.3 \
-MPI_Win_fence.3 \
-MPI_Win_free.3 \
-MPI_Win_free_keyval.3 \
-MPI_Win_get_attr.3 \
-MPI_Win_get_errhandler.3 \
-MPI_Win_get_group.3 \
-MPI_Win_get_name.3 \
-MPI_Win_post.3 \
-MPI_Win_set_attr.3 \
-MPI_Win_set_errhandler.3 \
-MPI_Win_set_name.3 \
-MPI_Win_start.3 \
-MPI_Win_wait.3 \
-MPI_Wtick.3 \
-MPI_Wtime.3 \
-XMPI_Buoy.3 \
-XMPI_Coloroff.3 \
-XMPI_Coloron.3 \
-libmpi.3
-
-MAN5= \
-CONSTANTS.5 \
-appschema.5 \
-bhost.5 \
-conf.5 \
-lam-helpfile.5 \
-procschema.5
-
-MAN7= \
-LAM.7 \
-MPI.7 \
-lam.7 \
-mpi.7
diff --git a/net/lam7/files/patch-man-mans-Makefile.in b/net/lam7/files/patch-man-mans-Makefile.in
deleted file mode 100644
index 9202a2aed5e8..000000000000
--- a/net/lam7/files/patch-man-mans-Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- man/mans/Makefile.in	Mon Jan 27 17:03:38 2003
-+++ man/mans/Makefile.in	Wed Jun 18 12:18:05 2003
-@@ -193,3 +193,3 @@
- 
--mansdir = $(mandir)/mans
-+mansdir = $(datadir)/lam
- MANS = $(man_MANS)
diff --git a/net/lam7/pkg-descr b/net/lam7/pkg-descr
deleted file mode 100644
index fe1d0e1b5ab3..000000000000
--- a/net/lam7/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-LAM (Local Area Multicomputer) is an MPI programming environment and
-development system for heterogeneous computers on a network.  With LAM,
-a dedicated cluster or an existing network computing infrastructure can act
-as one parallel computer solving one problem. 
-
-LAM features extensive debugging support in the application development cycle
-and peak performance for production applications.  LAM features a full
-implementation of the MPI communication standard.
-
-WWW: http://www.lam-mpi.org/
diff --git a/net/lam7/pkg-plist b/net/lam7/pkg-plist
deleted file mode 100644
index d66a3db691ec..000000000000
--- a/net/lam7/pkg-plist
+++ /dev/null
@@ -1,82 +0,0 @@
-bin/lamclean
-bin/lamexec
-bin/lamgrow
-bin/lamshrink
-bin/lamtrace
-bin/mpimsg
-bin/mpirun
-bin/mpitask
-bin/lamd
-bin/tping
-bin/hboot
-bin/hcc
-bin/hcp
-bin/mpicc
-bin/mpic++
-bin/mpiCC
-bin/hf77
-bin/mpif77
-bin/lamboot
-bin/lamhalt
-bin/lamnodes
-bin/recon
-bin/tkill
-bin/wipe
-bin/balky
-etc/lam-bhost.def
-etc/lam-bhost.lam
-etc/lam-conf.lam
-etc/lam-conf.otb
-etc/lam-helpfile
-include/lam_config.h
-include/mpi.h
-include/mpif.h
-include/mpi2c++/mpi2c++_config.h
-include/mpi2c++/mpi++.h
-include/mpi2c++/mpi2c++_map.h
-include/mpi2c++/mpi2c++_list.h
-include/mpi2c++/constants.h
-include/mpi2c++/functions.h
-include/mpi2c++/datatype.h
-include/mpi2c++/exception.h
-include/mpi2c++/op.h
-include/mpi2c++/status.h
-include/mpi2c++/request.h
-include/mpi2c++/group.h
-include/mpi2c++/comm.h
-include/mpi2c++/errhandler.h
-include/mpi2c++/intracomm.h
-include/mpi2c++/topology.h
-include/mpi2c++/intercomm.h
-include/mpi2c++/datatype_inln.h
-include/mpi2c++/functions_inln.h
-include/mpi2c++/request_inln.h
-include/mpi2c++/comm_inln.h
-include/mpi2c++/intracomm_inln.h
-include/mpi2c++/op_inln.h
-include/mpi2c++/topology_inln.h
-include/mpi2c++/intercomm_inln.h
-include/mpi2c++/group_inln.h
-include/mpi2c++/errhandler_inln.h
-include/mpi2c++/status_inln.h
-include/mpi++.h
-include/mpio.h
-include/mpiof.h
-lib/liblamf77mpi.la
-lib/liblamf77mpi.a
-lib/libpmpi.la
-lib/libpmpi.a
-lib/liblam.la
-lib/liblam.a
-lib/libmpi.la
-lib/libmpi.a
-lib/liblammpi++.a
-lib/liblammpio.a
-share/lam/doc/ROMIO-COPYRIGHT
-share/lam/doc/ROMIO-README
-share/lam/doc/ROMIO-README_LAM
-share/lam/doc/romio-users-guide.ps.gz
-share/lam/mpi.share
-@dirrm include/mpi2c++
-@dirrm share/lam/doc
-@dirrm share/lam
diff --git a/net/libnet10/Makefile b/net/libnet10/Makefile
deleted file mode 100644
index 1e2c60b510bb..000000000000
--- a/net/libnet10/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Ports collection makefile for:  libnet
-# Date created:			Sun Feb 3, 1999
-# Whom:				shipley@dis.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libnet
-PORTVERSION=	1.0.2a
-PORTEPOCH=	1
-CATEGORIES=	net
-MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
-
-MAINTAINER=	shipley@dis.org
-COMMENT=	A C library for creating IP packets
-
-CONFLICTS=	libnet-devel-1.1.*
-
-USE_AUTOCONF_VER=	213
-
-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/examples
-	@${MKDIR} ${PREFIX}/share/doc/libnet/ancillary
-.for i in CHANGELOG CHANGELOG-NEWFUNCTIONS COPYING README TODO-1.0 TODO-1.1
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/libnet
-.endfor
-.for i in README.asn.1 README.bpf README.legacy-applications README.libnet-config README.linux README.rawsockets
-	${INSTALL_DATA} ${WRKSRC}/doc/Ancillary/${i} ${PREFIX}/share/doc/libnet/ancillary
-.endfor
-.for i in libnet-example-1.c libnet-example-2.c libnet-example-3.c libnet-example-4.c
-	${INSTALL_DATA} ${WRKSRC}/example/${i} ${PREFIX}/share/doc/libnet/examples
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/libnet10/distinfo b/net/libnet10/distinfo
deleted file mode 100644
index 9b65812d77a9..000000000000
--- a/net/libnet10/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (libnet-1.0.2a.tar.gz) = ddf53f0f484184390e8c2a1bd0853667
-SIZE (libnet-1.0.2a.tar.gz) = 140191
diff --git a/net/libnet10/files/patch-aa b/net/libnet10/files/patch-aa
deleted file mode 100644
index 57137897cbc7..000000000000
--- a/net/libnet10/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.in.orig	Wed Jan 17 12:59:30 2001
-+++ configure.in	Mon Jul  2 19:18:50 2001
-@@ -50,10 +50,10 @@
- dnl Use these compiler flags if we have gcc.
- dnl
- if test $ac_cv_prog_gcc = yes; then
--dnl if test -z $CFLAGS; then 
--    CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
--    CFLAGS="$CCOPTS"
--dnl fi
-+    if test -z "$CFLAGS"; then 
-+        CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
-+        CFLAGS="$CCOPTS"
-+    fi
- fi
- 
- dnl
-@@ -163,8 +163,9 @@
-     LIB_PREFIX="$prefix/lib/aout"
-     INC_PREFIX="$prefix/include/"
-     BIN_PREFIX="$prefix/bin/"
--    AC_MSG_RESULT(Note: support/bpf-lkm/etherspoof contains the lkm source \
--required to spoof ethernet frames)
-+dnl etherspoof lkm is horrible and only necesary on < RELENG_4
-+dnl     AC_MSG_RESULT(Note: support/bpf-lkm/etherspoof contains the lkm source \
-+dnl required to spoof ethernet frames)
-     ln -sf FreeBSD support/bpf-lkm/etherspoof
-     ;;
- 
diff --git a/net/libnet10/files/patch-ab b/net/libnet10/files/patch-ab
deleted file mode 100644
index 9106f9921b2a..000000000000
--- a/net/libnet10/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	Mon Feb  5 09:51:41 2001
-+++ Makefile.in	Mon Jul  2 19:41:27 2001
-@@ -96,7 +96,7 @@
- 	$(ENSUREDIR) $(DESTDIR)$(LIB_PREFIX) 755
- 	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET) 755
- 	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755
--	$(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
-+#	$(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
- 	$(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755
- 	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIB_PREFIX)
- 	rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a
-@@ -108,7 +108,7 @@
- 	$(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
- 	$(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
- 	$(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
--	$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
-+#	$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
- 	$(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
- 
- 
diff --git a/net/libnet10/files/patch-ac b/net/libnet10/files/patch-ac
deleted file mode 100644
index f46b75aa79ca..000000000000
--- a/net/libnet10/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/libnet/libnet-functions.h.orig	Fri Jun  7 00:31:29 2002
-+++ include/libnet/libnet-functions.h	Fri Jun  7 00:31:41 2002
-@@ -74,7 +74,7 @@
-     int,                /* severity */
-     char *,             /* error message */
-     ...                 /* varargs */
--    );
-+    ) __printflike(2, 3);
- 
- 
- /*
diff --git a/net/libnet10/files/patch-include::libnet.h b/net/libnet10/files/patch-include::libnet.h
deleted file mode 100644
index e33a86fa3ecc..000000000000
--- a/net/libnet10/files/patch-include::libnet.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/libnet.h.orig	Fri Jul 18 15:11:05 2003
-+++ include/libnet.h	Fri Jul 18 15:12:16 2003
-@@ -84,9 +84,9 @@
- #define LIBNET_VERSION  "1.0.2a"
- 
- #if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
--#error "byte order has not been specified, you'll
--need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the
--documentation regarding the libnet-config script."
-+#error "byte order has not been specified, you'll"
-+"need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the"
-+"documentation regarding the libnet-config script."
- #endif
- 
- #endif  /* __LIBNET_H */
diff --git a/net/libnet10/pkg-descr b/net/libnet10/pkg-descr
deleted file mode 100644
index 8d5811f3c0fe..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.packetfactory.net/projects/libnet/
diff --git a/net/libnet10/pkg-plist b/net/libnet10/pkg-plist
deleted file mode 100644
index 212baac7b536..000000000000
--- a/net/libnet10/pkg-plist
+++ /dev/null
@@ -1,30 +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.a
-share/doc/libnet/CHANGELOG
-share/doc/libnet/CHANGELOG-NEWFUNCTIONS
-share/doc/libnet/COPYING
-share/doc/libnet/README
-share/doc/libnet/TODO-1.0
-share/doc/libnet/TODO-1.1
-share/doc/libnet/examples/libnet-example-1.c
-share/doc/libnet/examples/libnet-example-2.c
-share/doc/libnet/examples/libnet-example-3.c
-share/doc/libnet/examples/libnet-example-4.c
-share/doc/libnet/ancillary/README.asn.1
-share/doc/libnet/ancillary/README.bpf
-share/doc/libnet/ancillary/README.legacy-applications
-share/doc/libnet/ancillary/README.libnet-config
-share/doc/libnet/ancillary/README.linux
-share/doc/libnet/ancillary/README.rawsockets
-@dirrm share/doc/libnet/ancillary
-@dirrm share/doc/libnet/examples
-@dirrm share/doc/libnet
-@dirrm include/libnet
diff --git a/net/linneighborhood/Makefile b/net/linneighborhood/Makefile
deleted file mode 100644
index 2b8c14ac2511..000000000000
--- a/net/linneighborhood/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:    LinNeighborhood
-# Date created:                         2003/04/06
-# Whom:                                 Heiner <h.eichmann@gmx.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	LinNeighborhood
-PORTVERSION=	0.6.5
-PORTREVISION=	4
-CATEGORIES=	sysutils
-MASTER_SITES=	http://www.bnro.de/~schmidjo/download/
-
-MAINTAINER=	barner@gmx.de
-COMMENT=	GTK+ gui for browsing and mounting SMB filesystems
-
-RUN_DEPENDS=	smbclient:${PORTSDIR}/net/samba
-
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gtk12
-USE_REINPLACE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"\
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"\
-		CC="${CC} -I${LOCALBASE}/include"
-#                             ^
-# this was done intentionaly in order to make `configure' pick up libintl.h
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	${CP} ${FILESDIR}/mntent* ${WRKSRC}/src
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/net/linneighborhood/distinfo b/net/linneighborhood/distinfo
deleted file mode 100644
index 9c04b9486722..000000000000
--- a/net/linneighborhood/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (LinNeighborhood-0.6.5.tar.gz) = 5e50c9cef403164aca22be9ade0a7dbf
-SIZE (LinNeighborhood-0.6.5.tar.gz) = 399003
diff --git a/net/linneighborhood/files/mntent.h b/net/linneighborhood/files/mntent.h
deleted file mode 100644
index 1e37778b2178..000000000000
--- a/net/linneighborhood/files/mntent.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifdef HAVE_MNTENT_H
-#include <mntent.h>
-#else
-
-#ifndef mntent_h_
-#define mntent_h_
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/ucred.h>
-#include <sys/mount.h>
-
-#define MOUNTED "mounted"
-#define MNTTYPE_NFS "nfs"
-
-//#define MOPTSLEN (256 - (MNAMELEN * 2 + MFSNAMELEN + 2 * sizeof(int)))
-
-struct mntent {
-	char *mnt_fsname;   /* file system name */
-	char *mnt_dir; /* file system path prefix */
-	char *mnt_type;	   /* dbg, efs,	nfs */
-	char *mnt_opts;	   /* ro, hide,	etc. */
-	int  mnt_freq; /* dump frequency, in days */
-	int  mnt_passno;	   /* pass number on parallel fsck */
-};
-
-FILE * setmntent(char * filep, char * type);
-struct mntent *getmntent(FILE * filep);
-//char * hasmntopt(struct mntent * mnt, char * opt);
-int endmntent(FILE * filep);
-
-#endif /* mntent_h_ */
-#endif /* not HAVE_MNTENT_H */
diff --git a/net/linneighborhood/files/mntent_compat.c b/net/linneighborhood/files/mntent_compat.c
deleted file mode 100644
index 9112983e61e6..000000000000
--- a/net/linneighborhood/files/mntent_compat.c
+++ /dev/null
@@ -1,88 +0,0 @@
-#include "mntent.h"
-#include <sys/param.h>
-//#include <sys/ucred.h>
-#include <sys/mount.h>
-#include <fstab.h>
-
-struct statfs *getmntent_mntbufp;
-int getmntent_mntcount = 0;
-int getmntent_mntpos = 0;
-char mntent_global_opts[256];
-struct mntent mntent_global_mntent;
-
-FILE * setmntent(char * filep, char * type)
-{
-	getmntent_mntpos = 0;
-	getmntent_mntcount = getmntinfo(&getmntent_mntbufp, MNT_WAIT);
-	return (FILE *)1; // dummy
-}
-
-void getmntent_addopt(char ** c, const char * s)
-{
-	int i = strlen(s);
-        *(*c)++ = ',';
-        strcpy(*c, s);
-        *c += i;
-}
-
-struct mntent *getmntent(FILE * filep)
-{
-	char *c = mntent_global_opts+2; 
-	struct fstab *fst;
-	if (getmntent_mntpos >= getmntent_mntcount)
-		return 0;
-	if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_RDONLY) strcpy(mntent_global_opts, "ro");
-		else strcpy(mntent_global_opts, "rw");
-
-        if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_SYNCHRONOUS)    getmntent_addopt(&c, "sync");
-        if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOEXEC)         getmntent_addopt(&c, "noexec");
-        if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOSUID)         getmntent_addopt(&c, "nosuid");
-        if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NODEV)          getmntent_addopt(&c, "nodev");
-        if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_UNION)          getmntent_addopt(&c, "union");
-        if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_ASYNC)          getmntent_addopt(&c, "async");
-        if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOATIME)        getmntent_addopt(&c, "noatime");
-        if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOCLUSTERR)     getmntent_addopt(&c, "noclusterr");
-        if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOCLUSTERW)     getmntent_addopt(&c, "noclusterw");
-        if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOSYMFOLLOW)    getmntent_addopt(&c, "nosymfollow");
-        if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_SUIDDIR)        getmntent_addopt(&c, "suiddir");
-		
-	mntent_global_mntent.mnt_fsname = getmntent_mntbufp[getmntent_mntpos].f_mntfromname;
-	mntent_global_mntent.mnt_dir = getmntent_mntbufp[getmntent_mntpos].f_mntonname;
-	mntent_global_mntent.mnt_type = getmntent_mntbufp[getmntent_mntpos].f_fstypename;
-        mntent_global_mntent.mnt_opts = mntent_global_opts;
-	if ((fst = getfsspec(getmntent_mntbufp[getmntent_mntpos].f_mntfromname)))
-        {
-        	mntent_global_mntent.mnt_freq = fst->fs_freq;
-        	mntent_global_mntent.mnt_passno = fst->fs_passno;
-        }
-        else if ((fst = getfsfile(getmntent_mntbufp[getmntent_mntpos].f_mntonname)))
-        {
-        	mntent_global_mntent.mnt_freq = fst->fs_freq;
-        	mntent_global_mntent.mnt_passno = fst->fs_passno;
-        }
-        else if (strcmp(getmntent_mntbufp[getmntent_mntpos].f_fstypename, "ufs") == 0) 
-        {
-                if (strcmp(getmntent_mntbufp[getmntent_mntpos].f_mntonname, "/") == 0)
-                {
-	        	mntent_global_mntent.mnt_freq = 1;
-        		mntent_global_mntent.mnt_passno = 1;
-                }
-                else
-                {
-	        	mntent_global_mntent.mnt_freq = 2;
-        		mntent_global_mntent.mnt_passno = 2;
-                }
-        } 
-        else
-        {
-        	mntent_global_mntent.mnt_freq = 0;
-        	mntent_global_mntent.mnt_passno = 0;
-        }
-        ++getmntent_mntpos;
-	return & mntent_global_mntent;
-}
-
-int endmntent(FILE * filep)
-{
-	return 0;
-}
diff --git a/net/linneighborhood/files/patch-Makefile.in b/net/linneighborhood/files/patch-Makefile.in
deleted file mode 100644
index 4f666cbaac08..000000000000
--- a/net/linneighborhood/files/patch-Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/Makefile.in.orig	Sun Jun  9 09:58:47 2002
-+++ src/Makefile.in	Thu Feb 13 09:05:55 2003
-@@ -88,14 +88,14 @@
- localedir = @localedir@
- 
- bin_PROGRAMS = LinNeighborhood
--LinNeighborhood_SOURCES = browsewrap.c data.c filesystem.c gtk_dialog.c gtk_gui.c gtk_mountdlg.c gtk_sharewindow.c gtk_tree.c guiwrap.c io.c libsmb.c lmhosts.c main.c preferences.c smbbrowse.c smbmount.c utility.c
-+LinNeighborhood_SOURCES = browsewrap.c data.c filesystem.c gtk_dialog.c gtk_gui.c gtk_mountdlg.c gtk_sharewindow.c gtk_tree.c guiwrap.c io.c libsmb.c lmhosts.c main.c preferences.c smbbrowse.c smbmount.c utility.c mntent_compat.c
- 
--noinst_HEADERS = browsewrap.h data.h define.h filesystem.h gtk_dialog.h gtk_gui.h gtk_mountdlg.h gtk_sharewindow.h gtk_tree.h guiwrap.h io.h libsmb.h preferences.h samba.h smbif.h utility.h
-+noinst_HEADERS = browsewrap.h data.h define.h filesystem.h gtk_dialog.h gtk_gui.h gtk_mountdlg.h gtk_sharewindow.h gtk_tree.h guiwrap.h io.h libsmb.h preferences.h samba.h smbif.h utility.h mntent.h
- 
- 
- LinNeighborhood_LDADD = @GTK_LIBS@
- INCLUDES = @GTK_CFLAGS@ -DLIBDIR=\"$(libdir)\" -DDATADIR=\"$(datadir)\"
--LIBS = @GTK_LIBS@ -lpthread
-+LIBS = @GTK_LIBS@ -lc_r -lutil
- 
- EXTRA_DIST = picture
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -110,7 +110,7 @@
- LinNeighborhood_OBJECTS =  browsewrap.o data.o filesystem.o gtk_dialog.o \
- gtk_gui.o gtk_mountdlg.o gtk_sharewindow.o gtk_tree.o guiwrap.o io.o \
- libsmb.o lmhosts.o main.o preferences.o smbbrowse.o smbmount.o \
--utility.o
-+utility.o mntent_compat.o
- LinNeighborhood_DEPENDENCIES = 
- LinNeighborhood_LDFLAGS = 
- CFLAGS = @CFLAGS@
diff --git a/net/linneighborhood/files/patch-data.c b/net/linneighborhood/files/patch-data.c
deleted file mode 100644
index 7138363dbe20..000000000000
--- a/net/linneighborhood/files/patch-data.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/data.c.orig	Thu Apr 10 21:59:12 2003
-+++ src/data.c	Thu Apr 10 22:45:59 2003
-@@ -171,6 +171,9 @@
- {
-   if ( mount )
-   {
-+    char *c = strchr(mount->machine, '@');  // remove user name from smb name
-+    if (c) 
-+      memmove(mount->machine, c+1, strlen(c)+1);
-     if ( mount_list_search_by_mountpoint(mount->mountpoint) == NULL )
-     {
-       mountlist = g_slist_append(mountlist, mount);
diff --git a/net/linneighborhood/files/patch-gtk_dialog.c b/net/linneighborhood/files/patch-gtk_dialog.c
deleted file mode 100644
index 357795ad7b26..000000000000
--- a/net/linneighborhood/files/patch-gtk_dialog.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- src/gtk_dialog.c.orig	Sun Apr  6 13:07:13 2003
-+++ src/gtk_dialog.c	Sun Apr  6 13:10:50 2003
-@@ -2039,34 +2039,34 @@
-     gtk_widget_show(button);
-     
-     frame = gtk_frame_new(_(" smbmount version "));
--    gtk_container_border_width(GTK_CONTAINER(frame), 3);
--    gtk_box_pack_start(GTK_BOX(frame_vbox), frame, FALSE, TRUE, 0);
--    gtk_widget_show(frame);
-+//    gtk_container_border_width(GTK_CONTAINER(frame), 3);
-+//    gtk_box_pack_start(GTK_BOX(frame_vbox), frame, FALSE, TRUE, 0);
-+//    gtk_widget_show(frame);
-     
-     frame_vbox = gtk_vbox_new(FALSE, 0);
--    gtk_container_border_width(GTK_CONTAINER(frame_vbox), 5);
--    gtk_container_add(GTK_CONTAINER(frame), frame_vbox);
--    gtk_widget_show(frame_vbox);
-+//    gtk_container_border_width(GTK_CONTAINER(frame_vbox), 5);
-+//    gtk_container_add(GTK_CONTAINER(frame), frame_vbox);
-+//    gtk_widget_show(frame_vbox);
- 
-     smbmount_204_radio = gtk_radio_button_new_with_label(NULL, _("version <= 2.0.4"));
--    if ( globals.linux_version < LINUX_2_2 )
--      gtk_widget_set_sensitive(smbmount_204_radio, FALSE);
--    gtk_box_pack_start(GTK_BOX(frame_vbox), smbmount_204_radio, FALSE, TRUE, 0);
--    gtk_widget_show(smbmount_204_radio);
-+//    if ( globals.linux_version < LINUX_2_2 )
-+//      gtk_widget_set_sensitive(smbmount_204_radio, FALSE);
-+//    gtk_box_pack_start(GTK_BOX(frame_vbox), smbmount_204_radio, FALSE, TRUE, 0);
-+//    gtk_widget_show(smbmount_204_radio);
- 
-     smbmount_205_radio = gtk_radio_button_new_with_label(
-         gtk_radio_button_group(GTK_RADIO_BUTTON(smbmount_204_radio)), _("version = 2.0.5"));
--    if ( globals.linux_version < LINUX_2_2 )
--      gtk_widget_set_sensitive(smbmount_205_radio, FALSE);
--    gtk_box_pack_start(GTK_BOX(frame_vbox), smbmount_205_radio, FALSE, TRUE, 0);
--    gtk_widget_show(smbmount_205_radio);
-+//    if ( globals.linux_version < LINUX_2_2 )
-+//      gtk_widget_set_sensitive(smbmount_205_radio, FALSE);
-+//    gtk_box_pack_start(GTK_BOX(frame_vbox), smbmount_205_radio, FALSE, TRUE, 0);
-+//    gtk_widget_show(smbmount_205_radio);
- 
-     smbmount_206_radio = gtk_radio_button_new_with_label(
-         gtk_radio_button_group(GTK_RADIO_BUTTON(smbmount_205_radio)), _("version >= 2.0.6"));
--    if ( globals.linux_version < LINUX_2_2 )
--      gtk_widget_set_sensitive(smbmount_206_radio, FALSE);
--    gtk_box_pack_start(GTK_BOX(frame_vbox), smbmount_206_radio, FALSE, TRUE, 0);
--    gtk_widget_show(smbmount_206_radio);
-+//    if ( globals.linux_version < LINUX_2_2 )
-+//      gtk_widget_set_sensitive(smbmount_206_radio, FALSE);
-+//    gtk_box_pack_start(GTK_BOX(frame_vbox), smbmount_206_radio, FALSE, TRUE, 0);
-+//    gtk_widget_show(smbmount_206_radio);
-     
-     switch ( pref.v.smbmount_version )
-     {
diff --git a/net/linneighborhood/files/patch-gtk_mountdlg.c b/net/linneighborhood/files/patch-gtk_mountdlg.c
deleted file mode 100644
index 39a88713af63..000000000000
--- a/net/linneighborhood/files/patch-gtk_mountdlg.c
+++ /dev/null
@@ -1,103 +0,0 @@
---- src/gtk_mountdlg.c.orig	Wed Apr  9 19:51:41 2003
-+++ src/gtk_mountdlg.c	Wed Apr  9 20:18:14 2003
-@@ -726,65 +726,65 @@
-     
-    /*root password */
-    frame = gtk_frame_new(_("Mount as Root"));
--   gtk_box_pack_start(GTK_BOX (GTK_DIALOG (mount_dlg)->vbox), frame, TRUE, TRUE, 5);
--   gtk_widget_show(frame);   
-+//   gtk_box_pack_start(GTK_BOX (GTK_DIALOG (mount_dlg)->vbox), frame, TRUE, TRUE, 5);
-+//   gtk_widget_show(frame);   
-    
-    vbox=gtk_vbox_new(FALSE,0);
--   gtk_container_border_width(GTK_CONTAINER(vbox), 3);
--   gtk_container_add(GTK_CONTAINER(frame),vbox);
--   gtk_widget_show(vbox);
-+//   gtk_container_border_width(GTK_CONTAINER(vbox), 3);
-+//   gtk_container_add(GTK_CONTAINER(frame),vbox);
-+//   gtk_widget_show(vbox);
- 
-    hbox=gtk_hbox_new(FALSE,0);
- /*   gtk_box_pack_start(GTK_BOX (GTK_DIALOG (mount_dlg)->vbox),
-                     	hbox, TRUE, TRUE, 5);
-    gtk_container_border_width(GTK_CONTAINER(hbox), 3);
-    gtk_container_add(GTK_CONTAINER(frame),hbox); */
--   gtk_box_pack_start(GTK_BOX (vbox),hbox, TRUE, TRUE, 0);
--   gtk_widget_show(hbox);
-+//   gtk_box_pack_start(GTK_BOX (vbox),hbox, TRUE, TRUE, 0);
-+//   gtk_widget_show(hbox);
- 
-    sumountcheckbox = gtk_check_button_new_with_label(_("OK"));
- /*   gtk_widget_set_usize(sumountcheckbox,120,-1); */
--   if (geteuid()==0) /*No root password if you are root*/
--     gtk_widget_set_sensitive(sumountcheckbox,FALSE);
--   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(sumountcheckbox),cachesupwd & sumount);
--   gtk_box_pack_start (GTK_BOX (hbox), sumountcheckbox, FALSE, TRUE, 0);
--   gtk_widget_show (sumountcheckbox);
-+//   if (geteuid()==0) /*No root password if you are root*/
-+//     gtk_widget_set_sensitive(sumountcheckbox,FALSE);
-+//   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(sumountcheckbox),cachesupwd & sumount);
-+//   gtk_box_pack_start (GTK_BOX (hbox), sumountcheckbox, FALSE, TRUE, 0);
-+//   gtk_widget_show (sumountcheckbox);
- 
-    label=gtk_label_new(_("Password:"));
--   gtk_box_pack_start(GTK_BOX (hbox),label, FALSE, TRUE, 0);
-+//   gtk_box_pack_start(GTK_BOX (hbox),label, FALSE, TRUE, 0);
- /*   gtk_widget_set_usize(label,100,-1); */
--   gtk_label_set_justify(GTK_LABEL(label),GTK_JUSTIFY_LEFT);
--   gtk_widget_show(label);
-+//   gtk_label_set_justify(GTK_LABEL(label),GTK_JUSTIFY_LEFT);
-+//   gtk_widget_show(label);
- 
-    supasswdentry= gtk_entry_new_with_max_length(MASTER_LEN);
--   gtk_entry_set_visibility(GTK_ENTRY(supasswdentry), 0);
-+//   gtk_entry_set_visibility(GTK_ENTRY(supasswdentry), 0);
- 
--   if (sumount && cachesupwd)
--     gtk_entry_set_text (GTK_ENTRY (supasswdentry), supasswd);
--   else
--     gtk_entry_set_text (GTK_ENTRY (supasswdentry), "");
-+//   if (sumount && cachesupwd)
-+//     gtk_entry_set_text (GTK_ENTRY (supasswdentry), supasswd);
-+//   else
-+//     gtk_entry_set_text (GTK_ENTRY (supasswdentry), "");
-   
--   gtk_widget_set_sensitive(supasswdentry,sumount&cachesupwd);
--   gtk_signal_connect_object(GTK_OBJECT(supasswdentry), "key_press_event",
--                  	GTK_SIGNAL_FUNC(smb_mount_key_press_callback), NULL);
--   gtk_box_pack_start (GTK_BOX (hbox), supasswdentry, TRUE, TRUE, 5);
--   gtk_widget_show (supasswdentry);
--   gtk_signal_connect (GTK_OBJECT(sumountcheckbox), "toggled",
--                GTK_SIGNAL_FUNC(supwentry_toggle_sensitive),supasswdentry);
-+//   gtk_widget_set_sensitive(supasswdentry,sumount&cachesupwd);
-+//   gtk_signal_connect_object(GTK_OBJECT(supasswdentry), "key_press_event",
-+//                  	GTK_SIGNAL_FUNC(smb_mount_key_press_callback), NULL);
-+//   gtk_box_pack_start (GTK_BOX (hbox), supasswdentry, TRUE, TRUE, 5);
-+//   gtk_widget_show (supasswdentry);
-+//   gtk_signal_connect (GTK_OBJECT(sumountcheckbox), "toggled",
-+//                GTK_SIGNAL_FUNC(supwentry_toggle_sensitive),supasswdentry);
- 
-    hbox=gtk_hbox_new(FALSE,0);
--   gtk_box_pack_start(GTK_BOX (vbox),hbox, TRUE, TRUE, 0);
--   gtk_widget_show(hbox);
-+//   gtk_box_pack_start(GTK_BOX (vbox),hbox, TRUE, TRUE, 0);
-+//   gtk_widget_show(hbox);
- 
-    sucachepwdcheckbox = gtk_check_button_new_with_label(_("Cache Root Password"));
- 
- /*   gtk_widget_set_usize(sumountcheckbox,120,-1); */
--   if (geteuid()==0) 
--     gtk_widget_set_sensitive(sumountcheckbox,FALSE);
--   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(sucachepwdcheckbox),cachesupwd &sumount);
--   gtk_widget_set_sensitive(sucachepwdcheckbox,sumount);
--   gtk_box_pack_start (GTK_BOX (hbox), sucachepwdcheckbox, FALSE, TRUE, 0);
--   gtk_widget_show (sucachepwdcheckbox);
-+//   if (geteuid()==0) 
-+//     gtk_widget_set_sensitive(sumountcheckbox,FALSE);
-+//   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(sucachepwdcheckbox),cachesupwd &sumount);
-+//   gtk_widget_set_sensitive(sucachepwdcheckbox,sumount);
-+//   gtk_box_pack_start (GTK_BOX (hbox), sucachepwdcheckbox, FALSE, TRUE, 0);
-+//   gtk_widget_show (sucachepwdcheckbox);
- 
-    /*-action_area*/
-    mount_button = gtk_button_new_with_label(_("Mount"));
diff --git a/net/linneighborhood/files/patch-gtk_tree.c b/net/linneighborhood/files/patch-gtk_tree.c
deleted file mode 100644
index f0f78a24942c..000000000000
--- a/net/linneighborhood/files/patch-gtk_tree.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/gtk_tree.c.orig	Wed Apr  9 20:32:53 2003
-+++ src/gtk_tree.c	Wed Apr  9 20:48:24 2003
-@@ -2011,7 +2011,7 @@
-     if ( GTK_IS_TREE_ITEM(item) )
-     {
-       box = GTK_BIN(item)->child;
--
-+      if (!box) return itemtype;
-       step_list = GTK_BOX(box)->children->next;  /* type entry */
-       child = step_list->data;
-       label = GTK_LABEL(child->widget);
-@@ -2033,7 +2033,6 @@
- static unsigned int tree_item_count (GtkTreeItem *item)
- {
-   unsigned int ireturn;
--
-   if ( item != NULL )
-   {
-     if ( item->subtree )
diff --git a/net/linneighborhood/files/patch-io.c b/net/linneighborhood/files/patch-io.c
deleted file mode 100644
index 6bc1993370ec..000000000000
--- a/net/linneighborhood/files/patch-io.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/io.c.orig	Fri Apr 11 16:58:15 2003
-+++ src/io.c	Fri Apr 11 17:03:11 2003
-@@ -130,12 +130,12 @@
-     /* save only 'not root' mounts -> plain password */
-     if ( (mount != NULL) && (mount->type != mem_mount_root) )
-     {
--      string_ncopy(str, pref.v.smbmount_exe, MAXMACHNAMEL+MAXSHRNAMEL+PATH_LEN+19);
-+      *str = 0;
-       temp = str;
--      temp += strlen(str);
-       merge_mount(&temp, mount, MAXMACHNAMEL+MAXSHRNAMEL+PATH_LEN+19 - strlen(str), 1);
-       string_ncat(str, "\n", MAXMACHNAMEL+MAXSHRNAMEL+PATH_LEN+19);
--      fwrite(str, 1, strlen(str), fd);
-+      if (*temp == ' ') ++temp;
-+      fwrite(temp, 1, strlen(temp), fd);
-     }
-   }
- }
diff --git a/net/linneighborhood/files/patch-lmhosts.c b/net/linneighborhood/files/patch-lmhosts.c
deleted file mode 100644
index 9fad8a3005b6..000000000000
--- a/net/linneighborhood/files/patch-lmhosts.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/lmhosts.c.orig	Thu Feb 13 08:48:40 2003
-+++ src/lmhosts.c	Thu Feb 13 08:49:05 2003
-@@ -31,6 +31,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
diff --git a/net/linneighborhood/files/patch-preferences.c b/net/linneighborhood/files/patch-preferences.c
deleted file mode 100644
index 3addda166a3d..000000000000
--- a/net/linneighborhood/files/patch-preferences.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/preferences.c.orig	Sun Jun  9 09:58:43 2002
-+++ src/preferences.c	Sun Apr  6 13:03:32 2003
-@@ -29,6 +29,8 @@
- #include "data.h"
- #include "utility.h"
- #include "samba.h"
-+#include <sys/types.h>
-+#include <netinet/in.h>
- 
- 
- #define LVERSION(major,minor,patch) (((((major)<<8)+(minor))<<8)+(patch))
-@@ -359,8 +361,8 @@
-   strcpy(pref->v.filemanager_exe, "xterm -e mc $MOUNTPOINT");
-   strcpy(pref->v.smbclient_exe, "smbclient");
-   strcpy(pref->v.nmblookup_exe, "nmblookup");
--  strcpy(pref->v.smbmount_exe, "smbmount");
--  strcpy(pref->v.smbumount_exe, "smbumount");
-+  strcpy(pref->v.smbmount_exe, "mount_smbfs");
-+  strcpy(pref->v.smbumount_exe, "umount");
-   pref->v.smbclient_arg[0] = 0;
-   pref->v.nmblookup_arg[0] = 0;
-   pref->v.smbmount_arg[0] = 0;
diff --git a/net/linneighborhood/files/patch-smbbrowse.c b/net/linneighborhood/files/patch-smbbrowse.c
deleted file mode 100644
index fd2f35d1fdfc..000000000000
--- a/net/linneighborhood/files/patch-smbbrowse.c
+++ /dev/null
@@ -1,78 +0,0 @@
---- src/smbbrowse.c.orig	Sun Jun  9 09:58:43 2002
-+++ src/smbbrowse.c	Thu Apr 10 15:39:19 2003
-@@ -716,8 +716,8 @@
-   browsedat->browse_state=search_head;
-   browsedat->lasttab=0;
-   if (*user==0){    
--    strcpy(browsedat->userpasswdstr,"-U%"); 
--    strcpy(browsedat->userdummystr,"-U%"); 
-+    strcpy(browsedat->userpasswdstr,"-N"); 
-+    strcpy(browsedat->userdummystr,"-N"); 
-   }
-   else
-   {
-@@ -829,6 +829,12 @@
-      dup2(browsedat->fd[1],STDOUT_FILENO);
-      
-      cArg[argcount++] = "nmblookup";
-+     cArg[argcount++] = "-S";
-+     cArg[argcount++] = "-d1";
-+     for ( loop = 0; loop < add_argcount; loop++ )
-+     {
-+       cArg[argcount++] = cAddArg[loop];
-+     }
-      if ( *wins_name )
-      {
-        cArg[argcount++] = "-U";
-@@ -841,12 +847,6 @@
-        cArg[argcount++] = "-M";
-        cArg[argcount++] = group_name;
-      }
--     cArg[argcount++] = "-S";
--     cArg[argcount++] = "-d1";
--     for ( loop = 0; loop < add_argcount; loop++ )
--     {
--       cArg[argcount++] = cAddArg[loop];
--     }
-      cArg[argcount++] = NULL;
-            
-      execvp(pref_get_nmblookup_exe(), cArg);
-@@ -870,15 +870,16 @@
-     }
-     else
-     {
--     if (*wins_name)
--       sprintf(logstr,"GetSMBGroups:%s -U %s -R %s -S -d1",pref_get_nmblookup_exe(),wins_name,group_type);
--     else
--       sprintf(logstr,"GetSMBGroups:%s -M %s -S -d1",pref_get_nmblookup_exe(),group_name);
-+     sprintf(logstr,"GetSMBGroups:%s -S -d1",pref_get_nmblookup_exe());
-      for ( loop = 0; loop < add_argcount; loop++ )
-      {
-        string_ncat(logstr, " ", MAXLOGSTRLEN);
-        string_ncat(logstr, cAddArg[loop], MAXLOGSTRLEN);
-      }
-+     if (*wins_name)
-+       sprintf(logstr+strlen(logstr)," -U %s -R %s",wins_name,group_type);
-+     else
-+       sprintf(logstr+strlen(logstr)," -M %s",group_name);
-      gui_log_window_insert_string(logstr,1);
-      close(browsedat->fd[1]);   
-      browsedat->group_master.group_name[MAXGROUPNAMEL]=0;
-@@ -1028,7 +1029,7 @@
-   }
-   browsedat=g_malloc(sizeof(HBROWSE_STRUCT));
-   if (*user==0)
--    strcpy(commandstr,"-U%"); 
-+    strcpy(commandstr,"-N"); 
-   else
-     sprintf(commandstr,"-U%s%%%s",user,passwd);
-    
-@@ -1274,7 +1275,7 @@
-   }
-   
-   if (*user==0)
--    strcpy(commandstr,"-U%"); 
-+    strcpy(commandstr,"-N"); 
-   else
-     sprintf(commandstr,"-U%s%%%s",user,passwd);
-   argv[++argnr]="smbclient";
diff --git a/net/linneighborhood/files/patch-smbmount.c b/net/linneighborhood/files/patch-smbmount.c
deleted file mode 100644
index 7d28983c406a..000000000000
--- a/net/linneighborhood/files/patch-smbmount.c
+++ /dev/null
@@ -1,483 +0,0 @@
---- src/smbmount.c.orig	Sun Jun  9 09:58:43 2002
-+++ src/smbmount.c	Fri Apr 11 16:55:26 2003
-@@ -16,6 +16,9 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
-+#include <sys/param.h>
-+#include <errno.h>
-+#include <poll.h>
- #include <string.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -70,6 +73,9 @@
- } UMOUNT_STRUCT;
- static GSList *umountlist = NULL;
- 
-+void split_arguments(char * arguments, char * argv[], int * argnr, GSList ** strlist);
-+char * storeInBuffer(const char * s, GSList ** strlist);
-+void execvp_with_password(const char * path, char * const argv[], const char * passwd, GSList * strlist);
- 
- char suprompt[] = "Passw";
- 
-@@ -322,6 +328,7 @@
-  int  pipe2_nok,pipe3_nok=1;
-  int  sumount,argnr=-1,passw_lf;
-  char commandstr[MAXMNTCOMMANDL],commandstr1[MAXMNTCOMMANDL];
-+ char num1[10], num2[10], num3[10], num4[10], tmp[MAXMNTCOMMANDL];
-  char opt_group[MAXMNTCOMMANDL];
-  char dummysmbpasswd[64];
- /*#ifdef LINUX2_0 */
-@@ -345,6 +352,7 @@
-  sumount=(supasswd!=NULL); 
-  passw_lf=(*smbpasswd==0) && !linux2_0; /*smbmount 2.0.3 always waits for password, 
-                                     even if called with -Uuser% or -N if server is in user level security*/
-+ passw_lf=1;
-  if (sumount|| passw_lf)
-   if (pipe(fdstdin))
-    {
-@@ -418,96 +426,53 @@
-   else
-   {
-     /* no sumount */
--    if(linux2_0)
-     {
--      argv[++argnr]="smbmount";
--      argv[++argnr]=servicename;
--      argv[++argnr]=mount_point;
--      argv[++argnr]="-c";
--      argv[++argnr]=clientname;
--      argv[++argnr]="-I";
--      argv[++argnr]=ipaddr;
--      if (*group_name)
-+      // bugfix: mount command might consist of more than one word (example: sudo mount_smbfs)
-+      split_arguments(pref_get_smbmount_exe(), argv, &argnr, &strlist);
-       {
--        argv[++argnr]="-D";
--        argv[++argnr]=group_name;
--      }
--      argv[++argnr]="-U";
--      argv[++argnr]=smbuser;
--      argv[++argnr]="-f";sprintf(filemodestr,"%d",filemode);
--      argv[++argnr]=filemodestr;
--      argv[++argnr]="-d";sprintf(dirmodestr,"%d",dirmode);
--      argv[++argnr]=dirmodestr;
--      argv[++argnr]="-u";sprintf(uidstr,"%d",uid);
--      argv[++argnr]=uidstr;
--      argv[++argnr]="-g";sprintf(gidstr,"%d",gid);
--      argv[++argnr]=gidstr;
--      if (*smbpasswd==0)
--        argv[++argnr]="-n";
--      else
--      {
--        argv[++argnr]="-P";
--        argv[++argnr]=smbpasswd;
--      }
--      argv[++argnr]=NULL;
--    }
--    else
--    {
--      /* linux 2.2/2.4 */
--      argv[++argnr]=pref_get_smbmount_exe();
--      argv[++argnr]=servicename;
--      if (pref.v.smbmount_version>SMBMOUNT_204) argv[++argnr]=mount_point;
--      if (pref.v.smbmount_version<SMBMOUNT_206)
--      {
--        /* 2.04/2.05 */
-+        sprintf(num1,"%d", filemode);
-+        sprintf(num2,"%d", dirmode);
-+        sprintf(num3,"%d", uid);
-+        sprintf(num4,"%d", gid);
-+        strcpy(commandstr1, "//");
-+        if (strlen(smbuser))
-+        {
-+          strcat(commandstr1, smbuser);
-+          strcat(commandstr1, "@");
-+        }
-+        if (strlen(servicename) > 2)
-+          strcat(commandstr1, servicename+2);
-+        argv[++argnr]="-f";
-+        argv[++argnr]=num1;
-+        argv[++argnr]="-d";
-+        argv[++argnr]=num2;
-+        argv[++argnr]="-u";
-+        argv[++argnr]=num3;
-+        argv[++argnr]="-g";
-+        argv[++argnr]=num4;
-         argv[++argnr]="-I";
--        argv[++argnr]=ipaddr;
-+        strcpy(tmp, ipaddr);
-+        argv[++argnr]=tmp;
-         if (*group_name)
-         {
-           argv[++argnr]="-W";
--          argv[++argnr]=group_name;
--        }
--        sprintf(userpasswd,"-U%s%%%s",smbuser,smbpasswd);
--        argv[++argnr]=userpasswd;
--        argv[++argnr]="-d0";
--        if (pref.v.smbmount_version <SMBMOUNT_205)
--        {
--         argv[++argnr]="-c";
--         argv[++argnr]=commandstr;
--         sprintf(commandstr,"mount %s -f %d -d %d -u %d -g %d",
--                /*escape_str_smbmnt(*/mount_point/*,&strlist)*/,filemode,dirmode,uid,gid);
--        }
--        if ( !is_empty_string(pref.v.smbmount_arg) )
--        {
--        }
--      }
--      else /*>=SMBMOUNT_206*/
--      {
--        argv[++argnr]="-o";
--        argv[++argnr]=commandstr;
--        sprintf(commandstr,"username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,ip=%s,debug=0",
--           smbuser,smbpasswd,filemode,dirmode,uid,gid,ipaddr);
--        if (*group_name)
--        {
--          strcat(commandstr,",workgroup=");
--          strcat(commandstr,escape_str(group_name,&strlist));
-+          argv[++argnr]= escape_str(group_name,&strlist);
-         }
-         if ( (port >= 0) && (port < 65536) )
-         {
--          string_ncat(commandstr, ",port=", MAXMNTCOMMANDL);
--          string_ncat(commandstr, port_str, MAXMNTCOMMANDL);
-+          strcat(tmp, ":");
-+          strcat(tmp, port_str);
-         }
-         if ( !is_empty_string(pref.v.smbmount_arg) )
-         {
--          if ( pref.v.smbmount_arg[0] != ',' )
--           string_ncat(commandstr, ",", MAXMNTCOMMANDL);
--          string_ncat(commandstr, escape_str(pref.v.smbmount_arg,&strlist), MAXMNTCOMMANDL);
-+          split_arguments(pref.v.smbmount_arg, argv, &argnr, &strlist);
-         }
-        }
-+       argv[++argnr]=commandstr1;
-+       argv[++argnr]=mount_point;
-        argv[++argnr]=NULL;
-       }
-   }
--  slist_free_with_data(&strlist);
-   mountdat=g_malloc(sizeof(MOUNT_STRUCT));
-   if((pipe2_nok=pipe(fdstdout))|| (pipe3_nok=pipe(fdstderr))||
-         (mountdat->childpid =fork())== -1)   
-@@ -521,7 +486,6 @@
-     g_print(_("smbmount pipe,fork error\n"));
-     return;
-   } 
--  
-   if (!mountdat->childpid)
-   {
-    close(fdstdout[0]);   
-@@ -536,7 +500,7 @@
-    if (sumount)
-      execvp("su",argv);
-    else
--     execvp(pref_get_smbmount_exe(),argv);
-+     execvp_with_password(argv[0], argv, smbpasswd, strlist);
-    write(STDERR_FILENO,notfound,sizeof(notfound)-1); 
-    _exit(0);
-   }
-@@ -547,9 +511,9 @@
-   else
-   {
-     i=0;
--    while(argv[i+1]) 
-+    while(argv[i]) 
-     {
--      mountdat->arglist[i]=g_strdup(argv[i+1]);
-+      mountdat->arglist[i]=g_strdup(argv[i]);
-       i++;
-     }
-     mountdat->arglist[i]=NULL;
-@@ -611,46 +575,9 @@
-   } 
-   else
-   {
--    if(linux2_0)
--    {
--      if (*smbpasswd!=0) argv[argnr-1]=dummysmbpasswd;
--    }
--    else
--    { 
--      if (pref.v.smbmount_version<SMBMOUNT_206)
--        sprintf(userpasswd,"-U%s%%%s",smbuser,dummysmbpasswd);
--      else
--      {
--       sprintf(commandstr,"username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,ip=%s,debug=0",
--          smbuser,dummysmbpasswd,filemode,dirmode,uid,gid,ipaddr);
--       if (*group_name){
--         strcat(commandstr,",workgroup=");
--         strcat(commandstr,group_name);
--       }
--       if ( (port >= 0) && (port < 65536) )
--       {
--         string_ncat(commandstr, ",port=", MAXMNTCOMMANDL);
--         string_ncat(commandstr, port_str, MAXMNTCOMMANDL);
--       }
--       if ( !is_empty_string(pref.v.smbmount_arg) )
--       {
--         if ( pref.v.smbmount_arg[0] != ',' )
--          string_ncat(commandstr, ",", MAXMNTCOMMANDL);
--         string_ncat(commandstr, escape_str(pref.v.smbmount_arg,&strlist), MAXMNTCOMMANDL);
--       }
--      }
--      if (passw_lf)
--      {
--       usleep(50000);
--       close(fdstdin[0]);
--       if (!waitpid(mountdat->childpid,NULL,WNOHANG))
--          write(fdstdin[1], "\n",1);
-+    log_execvp_str(argv[0],argv);
-        close(fdstdin[1]);
-       }
--    }
--    
--    log_execvp_str(pref_get_smbmount_exe(),argv);
--  }
-   mountlist=g_slist_append(mountlist,mountdat);
-   mountdat->linepos=0;  mountdat->linepos2=0;
-   mountdat->linenum=0;
-@@ -901,17 +828,13 @@
-   }
-   else
-   {
--    argv[0]=smb ? "smbumount":"umount";
--    argv[1]=mount_point;
-+    // bugfix: mount command might consist of more than one word (example: sudo mount_smbfs)
-+    int argnr = -1;
-+    split_arguments(pref_get_smbumount_exe(), argv, &argnr, &strlist);
-     if ( !is_empty_string(pref.v.smbumount_arg) )
--    {
--      argv[2] = pref.v.smbumount_arg;
--      argv[3] = NULL;
--    }
--    else
--    {
--      argv[2]=NULL;
--    }
-+      split_arguments(pref.v.smbumount_arg, argv, &argnr, &strlist);
-+    argv[++argnr]=mount_point;
-+    argv[++argnr] = NULL;
-   }
-   if((pipe2_nok=pipe(fdstdout))|| (pipe3_nok=pipe(fdstderr))||
-         (childpid =fork())== -1)   
-@@ -938,7 +861,7 @@
-      execvp("su",argv);
-    }  
-    else
--     execvp(smb ? pref_get_smbumount_exe():"umount",argv);
-+     execvp_with_password(argv[0], argv, "", strlist); 
-    write(STDERR_FILENO,notfound,sizeof(notfound)-1); 
-    _exit(0);
-   }
-@@ -958,7 +881,7 @@
-         gui_log_window_insert_string("*",0);
-    } 
-    else
--     log_execvp_str(smb ? pref_get_smbumount_exe():"umount",argv);
-+     log_execvp_str(argv[0], argv);
-    mountdat=g_malloc(sizeof(UMOUNT_STRUCT));
-    umountlist=g_slist_append(umountlist,mountdat);
-    mountdat->childpid=childpid;
-@@ -1015,6 +938,198 @@
-   slist_free_with_data(&umountlist);
- }
- 
-+void split_arguments(char * arguments, char * argv[], int * argnr, GSList ** strlist)
-+{
-+      char * c = argv[++*argnr] = storeInBuffer(arguments, strlist);
-+      while(c = strchr(c, ' '))
-+      {
-+        char *d = c+1;
-+        while(*d && *d == ' ')
-+          d++;
-+        *c = 0;
-+        c = d;
-+        if (!*c)
-+          break;
-+        argv[++*argnr] = storeInBuffer(c, strlist);
-+      }
-+}
-+
-+char * storeInBuffer(const char * s, GSList ** strlist)
-+{
-+  int n;
-+  char * ss;
-+  
-+  if (*s==0) return 0;
-+  n = strlen(s);
-+  ss=g_malloc(n+1);
-+  strcpy(ss, s);
-+  *strlist=g_slist_append(*strlist,ss);
-+  return ss;
-+}
-+
-+
-+// this looks like a global variable. But each forked execvp_with_password
-+// process has one copy of it. So it as a process local varible storing the
-+// process ID of the forked child process, which actaully execs mount_smbfs
-+int _childPid = 0;
-+
-+// called, if the child proces is killed. Kills its child process as well
-+void stopMountSignalHandler (int sig)
-+{
-+  kill(_childPid, SIGINT);
-+  waitpid(_childPid, 0, WUNTRACED);
-+  _exit(0);
-+}
-+
-+// replaces execvp to call mount_smbfs. If mount smbfs asks for a password, it is provided.
-+// This can not be sent to stdin, because BSD gets the password directly from the terminal.
-+// Therfore another process with a pseudo terminal is created.
-+void execvp_with_password(const char * path, char * const argv[], const char * passwd, GSList *strlist)
-+{
-+  int master, i;
-+  char  terminal[MAXPATHLEN] = "";
-+  char * pw = NULL;
-+  int slave;
-+  char password[1024], result[1024];
-+  char * passwordText = "password:";
-+  int passwordTextLen = strlen(passwordText);
-+  char * resp_pos = result;
-+  int fdstderr[2];
-+  
-+  // create a pipe to the child process for stderr. For stdout the pseudo terminal is used
-+  if(pipe(fdstderr))
-+  {
-+    fdstderr[0] = 0;
-+    fdstderr[1] = 0;
-+  }
-+  
-+  // create the child process and the pseudo terminal
-+  _childPid = forkpty(&master, terminal, NULL, NULL);
-+
-+  if (_childPid < 0)
-+  {
-+    if (errno == ENOENT)
-+      printf("Error: Out of ptys\n");
-+    else
-+      printf(result, "Error: Forkpty\n");
-+    _exit(1);
-+  }
-+  else if (_childPid == 0)
-+  {
-+    // prepare stderr pipe
-+    if (fdstderr[0])
-+    {
-+      close(fdstderr[0]);
-+      dup2(fdstderr[1], STDERR_FILENO);
-+    }
-+    
-+    // prepare the pseudo terminal
-+    close(master);
-+    slave = open(terminal, O_RDWR);
-+    if (slave < 0)
-+    {
-+      printf("open() failed: %s", strerror(errno));
-+      kill(_childPid, SIGINT);
-+      waitpid(_childPid, 0, WUNTRACED);
-+      _exit(1);
-+    }
- 
-+    // launch application (mount_smbfs)
-+    execvp(path, argv);
-+    printf("error: %d (%s)\n", errno, strerror(errno));
-+  }
-+  else
-+  {
-+    // prepare the stderr pipe
-+    if (fdstderr[1])
-+      close(fdstderr[1]);
- 
-+    // install the SIGIN (ctrl-c) handler
-+    if (signal(SIGINT, stopMountSignalHandler) == SIG_ERR)
-+      printf("error: can not install SIGINT handler\n");
-+    errno = 0;
-+    *resp_pos = 0;
-+    
-+    // main loop: wait for childs response
-+    while (!errno)
-+    {
-+      // prepare a poll, wich waits for output from the pseudo terminal and from stderr
-+      int pollnum = 1;
-+      struct pollfd polldat[2];
-+      polldat[0].fd = master;
-+      polldat[0].events = POLLIN | POLLRDNORM | POLLRDBAND | POLLPRI;
-+      if (fdstderr[0])
-+      {
-+        pollnum = 2;
-+        polldat[1].fd = fdstderr[0];
-+        polldat[1].events = POLLIN | POLLRDNORM | POLLRDBAND | POLLPRI;
-+      }
-+
-+      // sleep until the child terminates or sends something
-+      if (poll(polldat, pollnum, 1000) < 0)
-+        break;
- 
-+      // response from childs stderr?
-+      if (pollnum == 2 && polldat[1].revents)
-+      {
-+        // read response and send it to this process' stderr. It is connected
-+        // with another pipe with the main process!
-+        char s[1024];
-+        int i = read(fdstderr[0], s, 1024);
-+        if (errno)
-+          break;
-+        if (i > 0)
-+        {
-+          s[i] = 0;
-+          write(STDERR_FILENO, s, i);
-+        }
-+      }
-+
-+      // response from childs stdout?
-+      if (polldat[0].revents)
-+      {
-+        // read response and send it to this process' stdout. It is connected
-+        // with another pipe with the main process. If the string 'password'
-+       // was send, provide the password
-+        char c;
-+        if (read(master, &c, 1) <= 0 || errno)
-+          break;
-+        if (resp_pos - result < sizeof(result))
-+          *resp_pos++ = c;
-+        *resp_pos = 0;
-+        if (c == '\n')
-+        {
-+          printf("%s", result);
-+          resp_pos = result;
-+        }
-+        *resp_pos = 0;
-+        if (resp_pos - result >= passwordTextLen && !strcasecmp(resp_pos-passwordTextLen, passwordText))
-+        {
-+          // prepare the password and send it through the pseudo terminal
-+          strcpy(password, passwd);
-+          strcat(password, "\n");
-+          resp_pos = result;
-+          *resp_pos = 0;
-+          write(master, password, strlen(password));
-+        }
-+      }
-+      // if the child is dead, end main loop
-+      if (waitpid(_childPid,NULL,WNOHANG))
-+        break;
-+    }
-+    
-+    // if there is unsend response, send it to the main process
-+    printf("%s", result);
-+    
-+    // free resources
-+    if (fdstderr[0])
-+      close(fdstderr[0]);
-+    close(master);
-+    slist_free_with_data(&strlist);
-+    
-+    // get childs return code to avoid zombies
-+    waitpid(_childPid, 0, WUNTRACED);
-+    _exit(0);
-+  }
-+  _exit(-1); // can not be reached
-+}
diff --git a/net/linneighborhood/files/patch-utility.c b/net/linneighborhood/files/patch-utility.c
deleted file mode 100644
index 8ce3d9582a6b..000000000000
--- a/net/linneighborhood/files/patch-utility.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/utility.c.orig	Sun Jun  9 09:58:43 2002
-+++ src/utility.c	Thu Feb 13 09:56:06 2003
-@@ -16,6 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <stdio.h>
-@@ -421,9 +422,9 @@
- unsigned char path_exist (char *path)
- {
-   DIR *dir;
--  
-   dir = opendir(path);
--  closedir(dir);
-+  if (dir)
-+    closedir(dir);
-   return ( dir != NULL ) ? 1 : 0;
- }
- 
diff --git a/net/linneighborhood/pkg-descr b/net/linneighborhood/pkg-descr
deleted file mode 100644
index 085bd06e29c0..000000000000
--- a/net/linneighborhood/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-LinNeighborhood is a Xwindow graphical port of Network Neighborhood,
-running over Samba utilities and the smbfs.
-
-It permits to browse an SMB (CIFS) network consisting of Samba,
-Windows (WfWg, 95, 98, NT) and probably (not tested) OS/2, LanManager
-for DOS and others. It also offers an interface to mount the found shares.
-
-WWW: http://www.bnro.de/~schmidjo/index.html
-
---
-h.eichmann@gmx.de
diff --git a/net/linneighborhood/pkg-message b/net/linneighborhood/pkg-message
deleted file mode 100644
index e42459682b08..000000000000
--- a/net/linneighborhood/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-To mount shares with LinNeighborhood, there are the following possibilities:
-  - run it as root. (not recommended)
-  - give LinNeighborhood the suid flag (not recommended)
-  - give mount_smbfs and umount the suid flag (very bad!)
-  - install and configure sudo correctly and replace mount_smbfs and umount
-    in the preferences by "sudo mount_smbfs" and "sudo umount" (recommended).
-    Make sure, that all sudo rules concerning mount and umount have the
-    NOPASSWD flag. Otherwise two password questions might occur (one
-    from sudo and one from mount_smbfs) which will definitely go wrong.
diff --git a/net/linneighborhood/pkg-plist b/net/linneighborhood/pkg-plist
deleted file mode 100644
index affe370998a6..000000000000
--- a/net/linneighborhood/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-bin/LinNeighborhood
-share/locale/de/LC_MESSAGES/LinNeighborhood.mo
-share/locale/sv/LC_MESSAGES/LinNeighborhood.mo
-share/locale/ja/LC_MESSAGES/LinNeighborhood.mo
-share/locale/fr/LC_MESSAGES/LinNeighborhood.mo
-share/locale/ru/LC_MESSAGES/LinNeighborhood.mo
-share/locale/es/LC_MESSAGES/LinNeighborhood.mo
-share/locale/pt_BR/LC_MESSAGES/LinNeighborhood.mo
-share/locale/tr/LC_MESSAGES/LinNeighborhood.mo
-share/locale/pl/LC_MESSAGES/LinNeighborhood.mo
-share/locale/it/LC_MESSAGES/LinNeighborhood.mo
-share/locale/zh_TW/LC_MESSAGES/LinNeighborhood.mo
-share/icons/LinNeighborhood.xpm
-@dirrm share/icons
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
deleted file mode 100644
index 3627b501f23e..000000000000
--- a/net/linphone-base/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# New ports collection makefile for:	linphone
-# Date created:				30 December 2002
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	linphone
-PORTVERSION=	0.12.1
-PORTREVISION=	2
-PORTEPOCH=	1
-CATEGORIES=	net
-MASTER_SITES=	http://simon.morlat.free.fr/download/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTVERSION}/source
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A web phone that supports SIP protocol
-
-LIB_DEPENDS=	gsm.1:${PORTSDIR}/audio/gsm \
-		speex.2:${PORTSDIR}/audio/speex \
-		osip.9:${PORTSDIR}/net/libosip
-
-USE_GNOME=	gnomehack gnometarget
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--disable-ipv6
-INSTALLS_SHLIB=	yes
-
-MAN1=		linphone.1 linphonec.1 sipomatic.1
-
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--enable-gnome_ui=no --with-html-dir=${DOCSDIR}
-PLIST_SUB+=	GNOME="@comment " \
-		GNOME_PATH="" \
-		HTMLDOCSDIR="${DOCSDIR:S,^${PREFIX}/,,}"
-.else
-USE_X_PREFIX=	yes
-USE_GNOME+=	gnomepanel gnomeprefix
-DOCSDIR=	${GNOME_HTML_DIR}
-PLIST_SUB+=	GNOME="" \
-		GNOME_PATH="gnome/" \
-		HTMLDOCSDIR="${GNOME_HTML_DIR:S,^${PREFIX}/,,}"
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/linphone-base/distinfo b/net/linphone-base/distinfo
deleted file mode 100644
index 58da85137534..000000000000
--- a/net/linphone-base/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (linphone-0.12.1.tar.gz) = 62e94ca8e3a95297175ee0c3c6de13b1
-SIZE (linphone-0.12.1.tar.gz) = 8296534
diff --git a/net/linphone-base/files/patch-Makefile.in b/net/linphone-base/files/patch-Makefile.in
deleted file mode 100644
index 1431371048bc..000000000000
--- a/net/linphone-base/files/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Thu Nov 20 19:41:33 2003
-+++ Makefile.in	Fri Nov 21 11:04:35 2003
-@@ -156,8 +156,8 @@
- 
- @BUILD_TRUESPEECH_TRUE@WIN32ACM_DIR = win32acm
- 
--SUBDIRS = support pixmaps ffmpeg po macros debian ipkg oRTP gsmlib lpc10-1.5 \
--                speex $(WIN32ACM_DIR) mediastreamer \
-+SUBDIRS = support pixmaps ffmpeg po macros debian ipkg oRTP lpc10-1.5 \
-+                $(WIN32ACM_DIR) mediastreamer \
- 		media_api osipua coreapi console gnome share developer-docs
- 
- 
diff --git a/net/linphone-base/files/patch-config.h.in b/net/linphone-base/files/patch-config.h.in
deleted file mode 100644
index 464bc65832ff..000000000000
--- a/net/linphone-base/files/patch-config.h.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- config.h.in	2003/02/27 23:47:19	1.1
-+++ config.h.in	2003/02/27 23:47:35
-@@ -122,8 +122,5 @@
-    first (like Motorola and SPARC, unlike Intel and VAX). */
- #undef WORDS_BIGENDIAN
- 
--/* Defined if we are compiling for FreeBSD */
--#undef __FreeBSD__
--
- /* Defined if we are compiling for linux */
- #undef __LINUX__
diff --git a/net/linphone-base/files/patch-configure b/net/linphone-base/files/patch-configure
deleted file mode 100644
index c9d5cb8c243e..000000000000
--- a/net/linphone-base/files/patch-configure
+++ /dev/null
@@ -1,43 +0,0 @@
---- configure.orig	Thu Nov 20 19:41:45 2003
-+++ configure	Fri Nov 21 11:02:43 2003
-@@ -463,7 +463,7 @@
- # include <unistd.h>
- #endif"
- 
--ac_subdirs_all="$ac_subdirs_all ffmpeg speex oRTP osipua"
-+ac_subdirs_all="$ac_subdirs_all ffmpeg oRTP osipua"
- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS PTHREAD_LDFLAGS GSMLIB_CFLAGS osip_prefix IPV6_CFLAGS TRUESPEECH_CFLAGS BUILD_TRUESPEECH_TRUE BUILD_TRUESPEECH_FALSE NASM AVCODEC_LIBS GDK_CFLAGS GDK_LIBS BUILD_MEDIASTREAMER_TRUE BUILD_MEDIASTREAMER_FALSE HAVE_XINELIB_TRUE HAVE_XINELIB_FALSE HAVE_SMPEG_TRUE HAVE_SMPEG_FALSE BUILD_FFMPEG_TRUE BUILD_FFMPEG_FALSE BUILD_GDK_VO_TRUE BUILD_GDK_VO_FALSE BUILD_V4L_TRUE BUILD_V4L_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_FALSE BUILD_UGLIB_TRUE BUILD_UGLIB_FALSE BUILD_GNOME_TRUE BUILD_GNOME_FALSE BUILD_GNOME_APPLET_TRUE BUILD_GNOME_APPLET_FALSE ALSA_LIBS subdirs HTML_DIR GTKDOC HAVE_GTK_DOC_TRUE HAVE_GTK_DOC_FALSE HAVE_GTK_DOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE LINPHONE_CFLAGS LINPHONE_LIBS LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
-@@ -22300,19 +22300,19 @@
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define PACKAGE_LOCALE_DIR "${realprefix}/${DATADIRNAME}/locale"
-+#define PACKAGE_LOCALE_DIR "${realprefix}/share/locale"
- _ACEOF
- 
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define PACKAGE_DATA_DIR "${realprefix}/${DATADIRNAME}"
-+#define PACKAGE_DATA_DIR "${realprefix}/share/gnome"
- _ACEOF
- 
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define PACKAGE_SOUND_DIR "${realprefix}/${DATADIRNAME}/sounds/linphone"
-+#define PACKAGE_SOUND_DIR "${realprefix}/share/gnome/sounds/linphone"
- _ACEOF
- 
- 
-@@ -23669,7 +23669,7 @@
- 
- 
- 
--subdirs="$subdirs ffmpeg speex oRTP osipua"
-+subdirs="$subdirs ffmpeg oRTP osipua"
- 
- 
- ##################################################
diff --git a/net/linphone-base/files/patch-console::Makefile.in b/net/linphone-base/files/patch-console::Makefile.in
deleted file mode 100644
index 3061818ddb79..000000000000
--- a/net/linphone-base/files/patch-console::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- console/Makefile.in.orig	Wed Aug 20 17:47:05 2003
-+++ console/Makefile.in	Sat Aug 23 01:16:01 2003
-@@ -164,7 +164,6 @@
- 	-I$(top_srcdir)/oRTP/src \
- 	-I$(top_srcdir)/oRTP/ \
- 	-I$(top_srcdir)/mediastreamer \
--	-I$(top_srcdir)/speex/libspeex \
- 	-I$(osip_prefix)/include/ 
- 
- 
diff --git a/net/linphone-base/files/patch-coreapi::Makefile.in b/net/linphone-base/files/patch-coreapi::Makefile.in
deleted file mode 100644
index 4606e6766796..000000000000
--- a/net/linphone-base/files/patch-coreapi::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- coreapi/Makefile.in.orig	Wed Aug 20 17:46:46 2003
-+++ coreapi/Makefile.in	Sat Aug 23 01:14:24 2003
-@@ -166,7 +166,6 @@
- 	-I$(top_srcdir)/oRTP/src \
- 	-I$(top_srcdir)/oRTP/ \
- 	-I$(top_srcdir)/mediastreamer \
--	-I$(top_srcdir)/speex/libspeex \
- 	-I$(osip_prefix)/include/ 
- 
- 
diff --git a/net/linphone-base/files/patch-coreapi::linphonecore.c b/net/linphone-base/files/patch-coreapi::linphonecore.c
deleted file mode 100644
index 0e758bdd463a..000000000000
--- a/net/linphone-base/files/patch-coreapi::linphonecore.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- coreapi/linphonecore.c.orig	Fri Nov  7 00:27:42 2003
-+++ coreapi/linphonecore.c	Fri Nov 21 11:59:25 2003
-@@ -33,6 +33,7 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-+#include <netdb.h>  
- 
- #ifdef INET6  
- #include <netdb.h>  
diff --git a/net/linphone-base/files/patch-coreapi::misc.c b/net/linphone-base/files/patch-coreapi::misc.c
deleted file mode 100644
index 499b6f2aa060..000000000000
--- a/net/linphone-base/files/patch-coreapi::misc.c
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- coreapi/misc.c.orig	Sat Aug  9 00:10:47 2003
-+++ coreapi/misc.c	Sat Aug 23 00:08:50 2003
-@@ -93,7 +93,7 @@
- 	pid_t pid;
- 	
- 	/* try to kill all artsd*/
--	command=g_strdup_printf("ps -u %s |grep artsd",getenv("LOGNAME"));
-+	command=g_strdup_printf("ps -c %s |grep artsd",getenv("LOGNAME"));
- 	out=popen(command,"r");
- 	if (out!=NULL)
- 	{
-@@ -123,7 +123,7 @@
- 	g_free(command);
- 	
- 	/* do the same with esd*/
--	command=g_strdup_printf("ps -u %s |grep esd",getenv("LOGNAME"));
-+	command=g_strdup_printf("ps -c %s |grep esd",getenv("LOGNAME"));
- 	out=popen(command,"r");
- 	if (out!=NULL)
- 	{
diff --git a/net/linphone-base/files/patch-gnome::Makefile.in b/net/linphone-base/files/patch-gnome::Makefile.in
deleted file mode 100644
index 265978dd7665..000000000000
--- a/net/linphone-base/files/patch-gnome::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- gnome/Makefile.in.orig	Wed Aug 20 17:47:19 2003
-+++ gnome/Makefile.in	Sat Aug 23 01:16:42 2003
-@@ -162,7 +162,6 @@
- @BUILD_GNOME_TRUE@	-I$(top_srcdir)/oRTP/src \
- @BUILD_GNOME_TRUE@	-I$(top_srcdir)/oRTP/ \
- @BUILD_GNOME_TRUE@	-I$(top_srcdir)/mediastreamer \
--@BUILD_GNOME_TRUE@	-I$(top_srcdir)/speex/libspeex \
- @BUILD_GNOME_TRUE@	-I$(top_srcdir)/coreapi \
- @BUILD_GNOME_TRUE@	-I$(top_srcdir)/osipua/ \
- @BUILD_GNOME_TRUE@	-I$(top_srcdir)/osipua/src 
diff --git a/net/linphone-base/files/patch-gnome::callbacks.c b/net/linphone-base/files/patch-gnome::callbacks.c
deleted file mode 100644
index ad3af985d852..000000000000
--- a/net/linphone-base/files/patch-gnome::callbacks.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome/callbacks.c.orig	Fri Nov  7 21:08:34 2003
-+++ gnome/callbacks.c	Fri Nov 21 12:57:20 2003
-@@ -82,7 +82,7 @@
- on_user_manual1_activate               (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--	gnome_help_display("manual/index.html",NULL,NULL);
-+	gnome_help_display("index.html",NULL,NULL);
- }
- 
- 
diff --git a/net/linphone-base/files/patch-lpc10-1.5::lpcini.c b/net/linphone-base/files/patch-lpc10-1.5::lpcini.c
deleted file mode 100644
index 4398a7075055..000000000000
--- a/net/linphone-base/files/patch-lpc10-1.5::lpcini.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- lpc10-1.5/lpcini.c	2002/12/30 08:26:21	1.1
-+++ lpc10-1.5/lpcini.c	2002/12/30 08:28:01
-@@ -32,9 +32,9 @@
- 	-lf2c -lm   (in that order)
- */
- 
--#include "f2c.h"
-+#include <stdlib.h>
- 
--#include <malloc.h>
-+#include "f2c.h"
- 
- /* Common Block Declarations */
- 
diff --git a/net/linphone-base/files/patch-ltmain.sh b/net/linphone-base/files/patch-ltmain.sh
deleted file mode 100644
index d35bdf99a3c2..000000000000
--- a/net/linphone-base/files/patch-ltmain.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Wed May 14 00:39:58 2003
-+++ ltmain.sh	Sun Aug 17 19:29:50 2003
-@@ -4325,10 +4325,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net/linphone-base/files/patch-media_api::Makefile.in b/net/linphone-base/files/patch-media_api::Makefile.in
deleted file mode 100644
index 2cc794e5b04b..000000000000
--- a/net/linphone-base/files/patch-media_api::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- media_api/Makefile.in.orig	Wed Aug 20 17:46:39 2003
-+++ media_api/Makefile.in	Sat Aug 23 01:38:46 2003
-@@ -176,7 +176,6 @@
- 
- INCLUDES = -I$(top_srcdir)/mediastreamer \
- 		-I$(top_srcdir)/speex \
--		-I$(top_srcdir)/gsmlib \
- 		-I$(top_srcdir)/oRTP \
- 		-I$(top_srcdir)/oRTP/src \
- 		-I$(top_srcdir)/lpc10-1.5 \
diff --git a/net/linphone-base/files/patch-mediastreamer::Makefile.in b/net/linphone-base/files/patch-mediastreamer::Makefile.in
deleted file mode 100644
index bab51371dd00..000000000000
--- a/net/linphone-base/files/patch-mediastreamer::Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-
-$FreeBSD$
-
---- mediastreamer/Makefile.in.orig	Thu Nov 20 19:41:39 2003
-+++ mediastreamer/Makefile.in	Fri Nov 21 10:59:28 2003
-@@ -222,7 +222,7 @@
- 
- 
- libmediastreamer_la_LIBADD = $(GLIB_LIBS) \
--							../gsmlib/libgsm.la \
-+							-lgsm \
- 							../lpc10-1.5/liblpc10.la \
- 							../oRTP/src/libortp.la \
- 							$(ALSA_LIBS) \
-@@ -252,7 +252,7 @@
- 
- #the speex encoder and decoder 
- libmsspeex_la_SOURCES = msspeexenc.c msspeexenc.h msspeexdec.c msspeexdec.h
--libmsspeex_la_LIBADD = libmediastreamer.la $(top_srcdir)/speex/libspeex/libspeex.la
-+libmsspeex_la_LIBADD = libmediastreamer.la -lspeex
- 
- #the v4l plugin 
- libmsv4l_la_SOURCES = msv4l.c msv4l.h
-@@ -335,12 +335,8 @@
- 						-I$(top_srcdir)/mediastreamer \
- 						-I$(top_srcdir)/oRTP/src \
- 						-I$(top_srcdir)/oRTP \
--						-I$(top_srcdir)/gsmlib   \
- 						-I$(top_srcdir)/lpc10-1.5    \
-             -I$(top_srcdir)/ffmpeg/libavcodec \
--						-I/usr/X11R6/include/X11 \
--						-I/usr/include/SDL \
--						-I$(top_srcdir)/speex/libspeex \
- 						$(TRUESPEECH_INCLUDES)
- 
- subdir = mediastreamer
-@@ -351,12 +347,12 @@
- 
- libmediastreamer_la_LDFLAGS =
- @BUILD_TRUESPEECH_TRUE@libmediastreamer_la_DEPENDENCIES = \
--@BUILD_TRUESPEECH_TRUE@	../gsmlib/libgsm.la \
-+@BUILD_TRUESPEECH_TRUE@	-lgsm \
- @BUILD_TRUESPEECH_TRUE@	../lpc10-1.5/liblpc10.la \
- @BUILD_TRUESPEECH_TRUE@	../oRTP/src/libortp.la \
- @BUILD_TRUESPEECH_TRUE@	../win32acm/libwin32acm.a
- @BUILD_TRUESPEECH_FALSE@libmediastreamer_la_DEPENDENCIES = \
--@BUILD_TRUESPEECH_FALSE@	../gsmlib/libgsm.la \
-+@BUILD_TRUESPEECH_FALSE@	-lgsm \
- @BUILD_TRUESPEECH_FALSE@	../lpc10-1.5/liblpc10.la \
- @BUILD_TRUESPEECH_FALSE@	../oRTP/src/libortp.la
- @BUILD_TRUESPEECH_TRUE@am__objects_1 = mstruespeechencoder.lo \
-@@ -386,7 +382,7 @@
- libmssmpeg_la_OBJECTS = $(am_libmssmpeg_la_OBJECTS)
- libmsspeex_la_LDFLAGS =
- libmsspeex_la_DEPENDENCIES = libmediastreamer.la \
--	$(top_srcdir)/speex/libspeex/libspeex.la
-+	-lspeex
- am_libmsspeex_la_OBJECTS = msspeexenc.lo msspeexdec.lo
- libmsspeex_la_OBJECTS = $(am_libmsspeex_la_OBJECTS)
- libmsv4l_la_LDFLAGS =
diff --git a/net/linphone-base/files/patch-mediastreamer::msfifo.c b/net/linphone-base/files/patch-mediastreamer::msfifo.c
deleted file mode 100644
index f30f63710642..000000000000
--- a/net/linphone-base/files/patch-mediastreamer::msfifo.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- mediastreamer/msfifo.c	2002/12/30 08:33:16	1.1
-+++ mediastreamer/msfifo.c	2002/12/30 08:33:36
-@@ -23,6 +23,9 @@
- #include "msutils.h"
- #include "msfifo.h"
- 
-+#ifndef ENODATA
-+#define ENODATA  61
-+#endif
- 
- MSFifo * ms_fifo_new(MSBuffer *buf, gint r_gran, gint w_gran, gint r_offset, gint w_offset)
- {
diff --git a/net/linphone-base/files/patch-oRTP::configure b/net/linphone-base/files/patch-oRTP::configure
deleted file mode 100644
index 328fe8ff9f07..000000000000
--- a/net/linphone-base/files/patch-oRTP::configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- oRTP/configure.orig	Thu Nov 20 19:42:24 2003
-+++ oRTP/configure	Fri Nov 21 11:14:07 2003
-@@ -19430,8 +19430,6 @@
- 			CFLAGS="$CFLAGS +DA2.0W +DS2.0"
- 		fi
- 	fi
--else
--	CFLAGS="-O2 -g -Wall"
- fi
- 
- build_scheduler=yes
diff --git a/net/linphone-base/files/patch-oRTP::ltmain.sh b/net/linphone-base/files/patch-oRTP::ltmain.sh
deleted file mode 100644
index b2ed1cfb3dd6..000000000000
--- a/net/linphone-base/files/patch-oRTP::ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- oRTP/ltmain.sh.orig	Thu Nov 20 19:42:06 2003
-+++ oRTP/ltmain.sh	Fri Nov 21 13:13:05 2003
-@@ -5478,10 +5478,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net/linphone-base/files/patch-oRTP::src::port_fct.c b/net/linphone-base/files/patch-oRTP::src::port_fct.c
deleted file mode 100644
index ececcc89e337..000000000000
--- a/net/linphone-base/files/patch-oRTP::src::port_fct.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- oRTP/src/port_fct.c	2002/12/30 08:13:23	1.1
-+++ oRTP/src/port_fct.c	2002/12/30 08:13:35
-@@ -20,7 +20,7 @@
- 
- /* port_fct.h.  define methods to help for portability between unix and win32 */
- 
--
-+#include <sched.h>
- #include "rtpsession.h"
- 
- #include "port_fct.h"
diff --git a/net/linphone-base/files/patch-oRTP::src::scheduler.h b/net/linphone-base/files/patch-oRTP::src::scheduler.h
deleted file mode 100644
index a872fc24fcbd..000000000000
--- a/net/linphone-base/files/patch-oRTP::src::scheduler.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- oRTP/src/scheduler.h	2002/12/30 08:15:08	1.1
-+++ oRTP/src/scheduler.h	2002/12/30 08:15:16
-@@ -20,6 +20,8 @@
- #ifndef SCHEDULER_H
- #define SCHEDULER_H
- 
-+#include <pthread.h>
-+
- #include "rtpsession.h"
- #include "rtptimer.h"
- #include "sessionset.h"
diff --git a/net/linphone-base/files/patch-osipua::ltmain.sh b/net/linphone-base/files/patch-osipua::ltmain.sh
deleted file mode 100644
index e2ecc7c5b1fa..000000000000
--- a/net/linphone-base/files/patch-osipua::ltmain.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- osipua/ltmain.sh.orig	Wed May 14 00:40:19 2003
-+++ osipua/ltmain.sh	Sun Aug 17 19:30:25 2003
-@@ -4325,10 +4325,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net/linphone-base/files/patch-osipua::src::osipua.c b/net/linphone-base/files/patch-osipua::src::osipua.c
deleted file mode 100644
index 0ebdee4d5cd1..000000000000
--- a/net/linphone-base/files/patch-osipua::src::osipua.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- osipua/src/osipua.c.orig	Mon Oct 20 17:55:05 2003
-+++ osipua/src/osipua.c	Fri Nov 21 11:52:31 2003
-@@ -591,8 +591,7 @@
- 			if (ipaddr != NULL)
- 			{
- 				osip_trace(OSIP_INFO1,("osip_ua_find 1: %s <> %s \n",ua->ua_ipaddr,ipaddr));
--				if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) || (strcasecmp("127.0.0.1",ipaddr)==0) ||
--				   	IN6_IS_ADDR_LOOPBACK(res->ai_addr))
-+				if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) || (strcasecmp("127.0.0.1",ipaddr)==0))
- 				{
- 				   	 ret_ua=ua;       /* ip addresses match */
- 				}
diff --git a/net/linphone-base/files/patch-osipua::src::sdphandler.c b/net/linphone-base/files/patch-osipua::src::sdphandler.c
deleted file mode 100644
index 3af14a5dfbc1..000000000000
--- a/net/linphone-base/files/patch-osipua::src::sdphandler.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- osipua/src/sdphandler.c	2003/06/13 13:02:40	1.1
-+++ osipua/src/sdphandler.c	2003/06/13 13:02:48
-@@ -26,6 +26,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- 
- #ifdef HAVE_IFADDRS_H
- #include <ifaddrs.h>
diff --git a/net/linphone-base/files/patch-osipua::src::utils.c b/net/linphone-base/files/patch-osipua::src::utils.c
deleted file mode 100644
index de13b44ec129..000000000000
--- a/net/linphone-base/files/patch-osipua::src::utils.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- osipua/src/utils.c.orig	Thu Oct 23 13:06:43 2003
-+++ osipua/src/utils.c	Thu Oct 23 13:07:24 2003
-@@ -382,6 +382,7 @@
- 		abort();
- 		return -1;
- 	}
-+	((struct sockaddr_in *)(res->ai_addr))->sin_port=htons(9999);
- 	err=connect(sock,res->ai_addr,res->ai_addrlen);
- 	if (err<0) {
- 		osip_trace(OSIP_ERROR,("Error in connect: %s\n",strerror(errno)));
diff --git a/net/linphone-base/files/patch-share::Makefile.in b/net/linphone-base/files/patch-share::Makefile.in
deleted file mode 100644
index cb41ac4afd97..000000000000
--- a/net/linphone-base/files/patch-share::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- share/Makefile.in.orig	Wed Aug 20 17:49:21 2003
-+++ share/Makefile.in	Sat Aug 23 01:55:33 2003
-@@ -170,7 +170,7 @@
- confexdir = $(datadir)/linphonec
- confex_DATA = linphonec
- 
--pkgconfigdir = $(prefix)/lib/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = linphone.pc
- 
- EXTRA_DIST = $(LINPHONE_SOUNDS) \
diff --git a/net/linphone-base/pkg-descr b/net/linphone-base/pkg-descr
deleted file mode 100644
index 7a4d7fab5cf0..000000000000
--- a/net/linphone-base/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Linphone is a web phone: it let you phone to your friends anywhere in the
-whole world, freely, simply by using the internet. The cost of the phone call
-is the cost that you spend connected to the internet.
-
-WWW: http://www.linphone.org
diff --git a/net/linphone-base/pkg-plist b/net/linphone-base/pkg-plist
deleted file mode 100644
index 04d8816161e5..000000000000
--- a/net/linphone-base/pkg-plist
+++ /dev/null
@@ -1,169 +0,0 @@
-%%GNOME%%bin/linphone
-bin/linphonec
-bin/sipomatic
-include/linphone/config.h
-include/linphone/linphonecore.h
-include/linphone/sndcard.h
-include/ortp/ortp-config.h
-include/ortp/ortp.h
-include/ortp/payloadtype.h
-include/ortp/port_fct.h
-include/ortp/rtcp.h
-include/ortp/rtp.h
-include/ortp/rtpmod.h
-include/ortp/rtpport.h
-include/ortp/rtpsession.h
-include/ortp/rtpsignaltable.h
-include/ortp/rtptimer.h
-include/ortp/scheduler.h
-include/ortp/sessionset.h
-include/ortp/str_utils.h
-include/ortp/telephonyevents.h
-include/osipua/bodycontext.h
-include/osipua/bodyhandler.h
-include/osipua/osipdialog.h
-include/osipua/osipmanager.h
-include/osipua/osipua-config.h
-include/osipua/osipua.h
-include/osipua/regctxt.h
-include/osipua/resolver.h
-include/osipua/sdpcontext.h
-include/osipua/sdphandler.h
-include/osipua/utils.h
-lib/liblinphone.a
-lib/liblinphone.so
-lib/liblinphone.so.0
-lib/liblinphonegnome.a
-lib/liblinphonegnome.so
-lib/liblinphonegnome.so.0
-lib/libmediastreamer.a
-lib/libmediastreamer.so
-lib/libmediastreamer.so.0
-lib/libmsspeex.a
-lib/libmsspeex.so
-lib/libmsspeex.so.0
-lib/libortp.a
-lib/libortp.so
-lib/libortp.so.0
-lib/libosipalloc.a
-lib/libosipalloc.so
-lib/libosipalloc.so.0
-lib/libosipua.a
-lib/libosipua.so
-lib/libosipua.so.2
-%%GNOME%%libdata/bonobo/servers/GNOME_LinphoneApplet.server
-libdata/pkgconfig/linphone.pc
-%%GNOME%%libexec/linphone_applet
-%%HTMLDOCSDIR%%/mediastreamer/book1.html
-%%HTMLDOCSDIR%%/mediastreamer/coreapi.html
-%%HTMLDOCSDIR%%/mediastreamer/index.sgml
-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-filters.html
-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-msringplayer.html
-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-mssync.html
-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-running-processing-chains.html
-%%HTMLDOCSDIR%%/mediastreamer/msfilterimplementations.html
-%%HTMLDOCSDIR%%/mediastreamer/userapi.html
-%%HTMLDOCSDIR%%/ortp/book1.html
-%%HTMLDOCSDIR%%/ortp/index.sgml
-%%HTMLDOCSDIR%%/ortp/ortp-library-management-functions.html
-%%HTMLDOCSDIR%%/ortp/ortp-multiplexing-sessions-(in-a-one-thread-design).html
-%%HTMLDOCSDIR%%/ortp/ortp-rtp-payloads-and-profiles.html
-%%HTMLDOCSDIR%%/ortp/ortp-rtpsession-api.html
-%%HTMLDOCSDIR%%/ortp/ortp-stack-management-functions.html
-%%HTMLDOCSDIR%%/ortp/ortp-telephone-events-(rfc2833)-.html
-%%HTMLDOCSDIR%%/ortp/ortpapi.html
-%%HTMLDOCSDIR%%/osipua/book1.html
-%%HTMLDOCSDIR%%/osipua/index.sgml
-%%HTMLDOCSDIR%%/osipua/osipcallleg.html
-%%HTMLDOCSDIR%%/osipua/osipua--registrationctxt-api-.html
-%%HTMLDOCSDIR%%/osipua/osipua-osipcallleg-private-api.html
-%%HTMLDOCSDIR%%/osipua/osipua-osipcallleg-public-api.html
-%%HTMLDOCSDIR%%/osipua/osipua-osipua-private-api.html
-%%HTMLDOCSDIR%%/osipua/osipua-osipua-public-api.html
-%%HTMLDOCSDIR%%/osipua/osipua.html
-%%HTMLDOCSDIR%%/osipua/registrationctxt.html
-share/gnome/apps/Internet/linphone.desktop
-%%GNOME%%share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml
-share/gnome/help/linphone/C/docbook.css
-share/gnome/help/linphone/C/index.html
-share/gnome/help/linphone/C/params.html
-share/gnome/help/linphone/C/t1.html
-share/gnome/help/linphone/C/x118.html
-share/gnome/help/linphone/C/x121.html
-share/gnome/help/linphone/C/x137.html
-share/gnome/help/linphone/C/x143.html
-share/gnome/help/linphone/C/x167.html
-share/gnome/help/linphone/C/x172.html
-share/gnome/help/linphone/C/x188.html
-share/gnome/help/linphone/C/x26.html
-share/gnome/help/linphone/C/x36.html
-share/gnome/help/linphone/fr/docbook.css
-share/gnome/help/linphone/fr/params.html
-share/gnome/help/linphone/fr/registering.html
-share/gnome/help/linphone/fr/t1.html
-share/gnome/help/linphone/fr/x116.html
-share/gnome/help/linphone/fr/x134.html
-share/gnome/help/linphone/fr/x140.html
-share/gnome/help/linphone/fr/x164.html
-share/gnome/help/linphone/fr/x170.html
-share/gnome/help/linphone/fr/x188.html
-share/gnome/help/linphone/fr/x24.html
-share/gnome/help/linphone/fr/x34.html
-share/gnome/help/linphone/it/docbook.css
-share/gnome/help/linphone/it/params.html
-share/gnome/help/linphone/it/registering.html
-share/gnome/help/linphone/it/t1.html
-share/gnome/help/linphone/it/x116.html
-share/gnome/help/linphone/it/x134.html
-share/gnome/help/linphone/it/x140.html
-share/gnome/help/linphone/it/x164.html
-share/gnome/help/linphone/it/x170.html
-share/gnome/help/linphone/it/x189.html
-share/gnome/help/linphone/it/x24.html
-share/gnome/help/linphone/it/x34.html
-share/gnome/help/linphone/ja/params.html
-share/gnome/help/linphone/ja/t1.html
-share/gnome/help/linphone/ja/x112.html
-share/gnome/help/linphone/ja/x115.html
-share/gnome/help/linphone/ja/x131.html
-share/gnome/help/linphone/ja/x137.html
-share/gnome/help/linphone/ja/x161.html
-share/gnome/help/linphone/ja/x166.html
-share/gnome/help/linphone/ja/x182.html
-share/gnome/help/linphone/ja/x25.html
-share/gnome/help/linphone/ja/x35.html
-share/%%GNOME_PATH%%linphonec/linphonec
-share/%%GNOME_PATH%%pixmaps/linphone/linphone.png
-share/%%GNOME_PATH%%pixmaps/linphone/linphone2.png
-share/%%GNOME_PATH%%pixmaps/linphone/linphone2.xpm
-share/%%GNOME_PATH%%sounds/linphone/hello16000.wav
-share/%%GNOME_PATH%%sounds/linphone/hello8000.wav
-share/%%GNOME_PATH%%sounds/linphone/ringback.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/bigben.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/oldphone.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/orig.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/rock.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/sweet.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/synth.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/tapping.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/toy.wav
-share/locale/de/LC_MESSAGES/linphone.mo
-share/locale/es/LC_MESSAGES/linphone.mo
-share/locale/fr/LC_MESSAGES/linphone.mo
-share/locale/it/LC_MESSAGES/linphone.mo
-share/locale/ja/LC_MESSAGES/linphone.mo
-share/locale/pl/LC_MESSAGES/linphone.mo
-@dirrm share/%%GNOME_PATH%%sounds/linphone/rings
-@dirrm share/%%GNOME_PATH%%sounds/linphone
-@dirrm share/%%GNOME_PATH%%pixmaps/linphone
-@dirrm share/%%GNOME_PATH%%linphonec
-@dirrm share/gnome/help/linphone/ja
-@dirrm share/gnome/help/linphone/it
-@dirrm share/gnome/help/linphone/fr
-@dirrm share/gnome/help/linphone/C
-@dirrm share/gnome/help/linphone
-@dirrm %%HTMLDOCSDIR%%/osipua
-@dirrm %%HTMLDOCSDIR%%/ortp
-@dirrm %%HTMLDOCSDIR%%/mediastreamer
-@dirrm include/osipua
-@dirrm include/ortp
diff --git a/net/mcl/Makefile b/net/mcl/Makefile
deleted file mode 100644
index 738f7ed4004c..000000000000
--- a/net/mcl/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-# New ports collection makefile for:   mcl
-# Date created:        29 October 2003
-# Whom:                past@noc.ntua.gr
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mcl
-PORTVERSION=	2.99.1
-PORTREVISION=	1
-CATEGORIES=	mbone net
-MASTER_SITES=	http://www.inrialpes.fr/planete/people/roca/mcl/bin/
-DISTNAME=	mcl_v2.99.1
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	past@noc.ntua.gr
-COMMENT=	Implementation of the ALC and NORM Reliable Multicast Protocols
-
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/imake-4 \
-		gdome-config:${PORTSDIR}/textproc/gdome2 \
-		glib-gettextize:${PORTSDIR}/devel/glib20
-
-USE_REINPLACE=	yes
-INSTALLS_SHLIB=	yes
-USE_GMAKE=	yes
-MAN1=		fcast.1 fcastn.1 mclrecv2.1 mclsend2.1
-MAN2=		mcl_abort.2 mcl_close.2 mcl_ctl.2 mcl_open.2 mcl_recv.2 \
-		mcl_send.2 mcl_wait_event.2
-
-pre-patch:
-	@cd ${WRKSRC} &&  \
-		${MKDIR} bin/freebsd
-
-post-patch:
-	@${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \
-		${WRKSRC}/src/alc/Makefile
-	@${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \
-		${WRKSRC}/check/alc/Makefile
-	@${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \
-		${WRKSRC}/fcast/Makefile
-	@${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \
-		${WRKSRC}/flute/Makefile
-	@${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \
-		${WRKSRC}/mclftp/Makefile
-	@${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \
-		${WRKSRC}/robcast/Makefile
-
-pre-install:
-	@${REINPLACE_CMD} -Ee 's#../alc/#alc/#g' \
-		${WRKSRC}/src/common/mcl_lib_api.h
-	@${REINPLACE_CMD} -Ee 's#../norm/#norm/#g' \
-		${WRKSRC}/src/common/mcl_lib_api.h
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/fcast ${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/flute ${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/robcast_client ${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/robcast_server ${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/bin/freebsd/libmclalc.a ${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/src/common/mcl_lib_api.h ${PREFIX}/include
-	@${INSTALL_DATA} -d ${PREFIX}/include/alc
-	@${INSTALL_DATA} ${WRKSRC}/src/alc/mcl_lib_api_alc.h \
-		${PREFIX}/include/alc
-	@${INSTALL_MAN} ${WRKSRC}/man/fcast.man.1 ${PREFIX}/man/man1/fcast.1
-	@${INSTALL_MAN} ${WRKSRC}/man/fcastn.man.1 ${PREFIX}/man/man1/fcastn.1
-	@${INSTALL_MAN} ${WRKSRC}/man/mclrecv2.man.1 \
-		${PREFIX}/man/man1/mclrecv2.1
-	@${INSTALL_MAN} ${WRKSRC}/man/mclsend2.man.1 \
-		${PREFIX}/man/man1/mclsend2.1
-	@${INSTALL_MAN} ${WRKSRC}/man/mcl_abort.man.2 \
-		${PREFIX}/man/man2/mcl_abort.2
-	@${INSTALL_MAN} ${WRKSRC}/man/mcl_close.man.2 \
-		${PREFIX}/man/man2/mcl_close.2
-	@${INSTALL_MAN} ${WRKSRC}/man/mcl_ctl.man.2 ${PREFIX}/man/man2/mcl_ctl.2
-	@${INSTALL_MAN} ${WRKSRC}/man/mcl_open.man.2 \
-		${PREFIX}/man/man2/mcl_open.2
-	@${INSTALL_MAN} ${WRKSRC}/man/mcl_recv.man.2 \
-		${PREFIX}/man/man2/mcl_recv.2
-	@${INSTALL_MAN} ${WRKSRC}/man/mcl_send.man.2 \
-		${PREFIX}/man/man2/mcl_send.2
-	@${INSTALL_MAN} ${WRKSRC}/man/mcl_wait_event.man.2 \
-		${PREFIX}/man/man2/mcl_wait_event.2
-
-.include <bsd.port.mk>
diff --git a/net/mcl/distinfo b/net/mcl/distinfo
deleted file mode 100644
index d66d0a1a90d0..000000000000
--- a/net/mcl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (mcl_v2.99.1.tgz) = d4a5c0c384d45dfa6c2a3dcbdcb3a81e
-SIZE (mcl_v2.99.1.tgz) = 368784
diff --git a/net/mcl/files/patch-Makefile b/net/mcl/files/patch-Makefile
deleted file mode 100644
index 8c38fb03e633..000000000000
--- a/net/mcl/files/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig	Sun Dec  7 18:35:07 2003
-+++ Makefile	Sun Dec  7 18:35:20 2003
-@@ -5,8 +5,8 @@
- # We need the GNU make tool, on some systems it is called
- # gmake, on others make is an alias to gmake. Choose one...
- #
--MAKE = make
--#MAKE = gmake
-+#MAKE = make
-+MAKE = gmake
- 
- 
- # A phony target is one that is not really the name of a file.
diff --git a/net/mcl/files/patch-Makefile.common b/net/mcl/files/patch-Makefile.common
deleted file mode 100644
index f2b8c2b2975e..000000000000
--- a/net/mcl/files/patch-Makefile.common
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.common.orig	Sun Dec  7 18:36:25 2003
-+++ Makefile.common	Sun Dec  7 18:38:10 2003
-@@ -24,11 +24,15 @@
- ifeq (${SYSTEM},SunOS)
- 	OS = solaris
- endif
-+ifeq (${SYSTEM},FreeBSD)
-+	OS = freebsd
-+endif
- #
- # and the old way (e.g. if the above lines do not work!)
- #
- #OS = linux
- #OS = solaris
-+#OS = freebsd
- 
- 
- # Do you want/need extended memory debugging?
-@@ -59,6 +63,14 @@
- 	#
- 	CC = /opt/SUNWspro/bin/CC
- 	LD = /opt/SUNWspro/bin/CC 
-+endif
-+ifeq (${OS},freebsd)
-+	OSFLAGS = -DFREEBSD -I/usr/include/g++ -I/usr/include/c++/3.3
-+	# Which compiler?
-+	# NB: use -Wall for compilation warnings with gcc
-+	#
-+	CC = g++ -Wall
-+	LD = g++ -Wall
- endif
- 
- 
diff --git a/net/mcl/files/patch-alc-Makefile b/net/mcl/files/patch-alc-Makefile
deleted file mode 100644
index b38cb525c35f..000000000000
--- a/net/mcl/files/patch-alc-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/alc/Makefile.orig	Tue Jul 22 19:42:18 2003
-+++ src/alc/Makefile	Wed Oct 15 17:21:25 2003
-@@ -36,6 +36,13 @@
- 	LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lpthread
- endif
- 
-+ifeq (${OS},freebsd)
-+	# FreeBSD version
-+	BINDIR = ../../bin/freebsd
-+	LDPC_BINDIR = ../../../ldpc/bin/freebsd
-+	LIBRARIES = -lm -pthread
-+endif
-+
- 
- ###### Other Variables ######
- 
diff --git a/net/mcl/files/patch-check-alc-Makefile b/net/mcl/files/patch-check-alc-Makefile
deleted file mode 100644
index 65fa32515984..000000000000
--- a/net/mcl/files/patch-check-alc-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- check/alc/Makefile.orig	Wed Oct 15 18:02:27 2003
-+++ check/alc/Makefile	Wed Oct 15 17:24:04 2003
-@@ -35,6 +35,18 @@
- 	LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lposix4 -mt -lpthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
- endif
- 
-+ifeq (${OS},freebsd)
-+	# Linux version
-+	#
-+	BINDIR = ../../bin/freebsd
-+	LDPC_BINDIR = ../../../ldpc/bin/freebsd
-+	# Edit the following two lines as appropriate, according to the FEC
-+	# codec in use: if LDPC is used, then add the libbdpc.a library.
-+	#
-+	LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a
-+	#LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
-+endif
-+
- 
- ###### Other variables ######
- 
diff --git a/net/mcl/files/patch-display.c b/net/mcl/files/patch-display.c
deleted file mode 100644
index 44ff013dd66f..000000000000
--- a/net/mcl/files/patch-display.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- flute/display.c.orig	Wed Jan  7 12:08:23 2004
-+++ flute/display.c	Wed Jan  7 12:07:24 2004
-@@ -65,7 +65,11 @@
- 	signal (SIGTERM, sig_catcher);
- 	sigaction (SIGTERM, (struct sigaction *) 0, &sa);
- 	sa.sa_flags |= SA_RESTART;
-+#if defined(FREEBSD)
-+	sa.sa_flags &= ~SA_NOCLDSTOP;
-+#else
- 	sa.sa_flags &= ~SA_INTERRUPT;
-+#endif
- 	sigaction (SIGTERM, &sa, (struct sigaction *) 0);
- 	sigaction (SIGINT, &sa, (struct sigaction *) 0);
- 	tcsetattr(0, TCSANOW, &new_settings);
diff --git a/net/mcl/files/patch-fcast-Makefile b/net/mcl/files/patch-fcast-Makefile
deleted file mode 100644
index dce7b64a9811..000000000000
--- a/net/mcl/files/patch-fcast-Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- fcast/Makefile.orig	Tue Jul 22 19:43:25 2003
-+++ fcast/Makefile	Wed Oct 15 17:20:46 2003
-@@ -39,6 +39,14 @@
- 
- endif
- 
-+ifeq (${OS},freebsd)
-+	# FreeBSD version
-+	#
-+	BINDIR = ../bin/freebsd
-+	LDPC_BINDIR = ../../ldpc/bin/freebsd
-+	LIBRARIES = -lm -pthread
-+endif
-+
- 
- ###### Other variables ######
- 
-@@ -76,8 +84,8 @@
- # codec in use: if LDPC is used, then add the libbdpc.a library.
- # If only RSE is used and if you don't have the LDPC archive, then
- # remove the libbdpc.a library.
--#alc:	MCL_LIBRARY = ${BINDIR}/libmclalc.a
--alc:	MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
-+alc:	MCL_LIBRARY = ${BINDIR}/libmclalc.a
-+#alc:	MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
- alc:	TARGET_FCAST = ${BINDIR}/fcast
- #alc:	all
- 
diff --git a/net/mcl/files/patch-fcast.h b/net/mcl/files/patch-fcast.h
deleted file mode 100644
index bd50c0f41eb7..000000000000
--- a/net/mcl/files/patch-fcast.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- fcast/fcast.h.orig	Tue Jul 22 19:37:39 2003
-+++ fcast/fcast.h	Wed Oct 15 16:59:13 2003
-@@ -62,12 +62,16 @@
- #include "frecv.h"
- 
- 
-+
- #if defined(LINUX) /* On Linux systems, signal handlers must be of __sighandler_t type */
- #define	sighandler_t	__sighandler_t
- 
- #elif defined(SOLARIS) || defined(IRIX) || defined(WIN32)
--
- #define	sighandler_t	void (*)(int)
-+
-+#elif defined(FREEBSD)
-+#define sighandler_t	sig_t
-+
- #endif
- 
- 
diff --git a/net/mcl/files/patch-flute-Makefile b/net/mcl/files/patch-flute-Makefile
deleted file mode 100644
index 233632048d57..000000000000
--- a/net/mcl/files/patch-flute-Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
---- flute/Makefile.orig	Wed Nov 26 17:18:21 2003
-+++ flute/Makefile	Wed Jan  7 12:38:28 2004
-@@ -36,6 +36,18 @@
- 
- endif
- 
-+ifeq (${OS},freebsd)
-+	# FreeBSD version:
-+	# CC requires: -mt -lpthread for multithreaded applications
-+	# NB: mpatrol not installed !
-+	#
-+	BINDIR = ../bin/freebsd
-+	LDPC_BINDIR = ../../ldpc/bin/freebsd
-+	LIBRARIES = -lm -pthread -lglib-2.0 -lgdome -lxml2 -L/usr/local/lib
-+	# added -I/usr/local/include for libgdome header files
-+	ADD_INCLUDES = -I/usr/local/include/ -I/usr/local/include/glib-2.0/ -I/usr/local/include/libgdome/
-+endif
-+
- 
- ###### Other variables ######
- 
-@@ -73,24 +85,24 @@
- # codec in use: if LDPC is used, then add the libbdpc.a library.
- # If only RSE is used and if you don't have the LDPC archive, then
- # remove the libbdpc.a library.
--#alc:	MCL_LIBRARY = ${BINDIR}/libmclalc.a
--alc:	MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
-+alc:	MCL_LIBRARY = ${BINDIR}/libmclalc.a
-+#alc:	MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
- alc:	TARGET_FLUTE = ${BINDIR}/flute
- #alc:	all
- 
- alc_pure:	RM_PROTOCOL = ALC
- # Edit the following two lines as appropriate, according to the FEC
- # codec in use: if LDPC is used, then add the libbdpc.a library.
--#alc_pure:	MCL_LIBRARY = ${BINDIR}/libmclalc.a
--alc_pure:	MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
-+alc_pure:	MCL_LIBRARY = ${BINDIR}/libmclalc.a
-+#alc_pure:	MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
- alc_pure:	TARGET_FLUTE = ${BINDIR}/flute
- alc_pure:	pure
- 
- alc_quantify:	RM_PROTOCOL = ALC
- # Edit the following two lines as appropriate, according to the FEC
- # codec in use: if LDPC is used, then add the libbdpc.a library.
--#alc_quantify:	MCL_LIBRARY = ${BINDIR}/libmclalc.a
--alc_quantify:	MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
-+alc_quantify:	MCL_LIBRARY = ${BINDIR}/libmclalc.a
-+#alc_quantify:	MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
- alc_quantify:	TARGET_FLUTE = ${BINDIR}/flute
- alc_quantify:	quantify
- 
diff --git a/net/mcl/files/patch-flute.h b/net/mcl/files/patch-flute.h
deleted file mode 100644
index c38ad033f34c..000000000000
--- a/net/mcl/files/patch-flute.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- flute/flute.h.orig	Wed Jan  7 11:13:20 2004
-+++ flute/flute.h	Wed Jan  7 11:15:28 2004
-@@ -69,6 +69,10 @@
- #elif defined(SOLARIS) || defined(IRIX) || defined(WIN32)
- 
- #define	sighandler_t	void (*)(int)
-+
-+#elif defined(FREEBSD)
-+#define sighandler_t   sig_t
-+
- #endif
- 
- 
diff --git a/net/mcl/files/patch-mcl_debug.cpp b/net/mcl/files/patch-mcl_debug.cpp
deleted file mode 100644
index 982503f326c9..000000000000
--- a/net/mcl/files/patch-mcl_debug.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/mcl_debug.cpp.orig	Tue Jul 22 19:37:39 2003
-+++ src/common/mcl_debug.cpp	Wed Oct 15 17:55:58 2003
-@@ -73,7 +73,7 @@
- 	PRINT_OUT((mcl_stdout, "\tDUMP %d first bytes...\n\t", i * sizeof(int)))
- 	for (ptr = (int*)buf; i > 0; i--, ptr++) {
- 		/* convert to big endian format to be sure of byte order */
--		PRINT_OUT((mcl_stdout, "%08x ", htonl(*ptr)))
-+		PRINT_OUT((mcl_stdout, "%08lx ", htonl(*ptr)))
- 		if (++j == 8) {
- 			j = 0;
- 			PRINT_OUT((mcl_stdout, "\n\t"))
diff --git a/net/mcl/files/patch-mcl_includes.h b/net/mcl/files/patch-mcl_includes.h
deleted file mode 100644
index d68a50637331..000000000000
--- a/net/mcl/files/patch-mcl_includes.h
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/alc/mcl_includes.h.orig	Tue Jul 22 19:37:39 2003
-+++ src/alc/mcl_includes.h	Tue Oct 14 15:23:54 2003
-@@ -40,11 +40,13 @@
- #include <sys/types.h>
- #include <math.h>
- 
-+#ifndef FREEBSD
- #if defined(DEBUG) && defined(MPATROL) && !defined(WIN32)
- #include <mpatrol.h>
- #else
- #include <malloc.h>
- #endif
-+#endif
- #include <new>		// required by _set_new_handler on linux
- 
- 
-@@ -58,14 +60,18 @@
- #else	/* UNIX Systems */
- 
- #include <unistd.h>
-+
-+#ifndef FREEBSD
- #include <values.h>	/* for MAXINT */
-+#endif
-+
- #include <strings.h>
- #include <sys/time.h>
- #include <sys/wait.h>
- #include <pthread.h>
- #include <sys/uio.h>
- 
--#ifdef SOLARIS
-+#if defined(SOLARIS) || defined(FREEBSD)
- #include <netinet/in_systm.h>
- #endif /* SOLARIS */
- 
diff --git a/net/mcl/files/patch-mcl_lib.cpp b/net/mcl/files/patch-mcl_lib.cpp
deleted file mode 100644
index d40dbe58584c..000000000000
--- a/net/mcl/files/patch-mcl_lib.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/alc/mcl_lib.cpp.orig	Wed Nov 26 15:38:14 2003
-+++ src/alc/mcl_lib.cpp	Tue Dec 16 23:58:46 2003
-@@ -1384,8 +1384,10 @@
- 	if (id >= MCLCB_MAX_ID || (mclcb = mclcbs[id]) == NULL) {
- 		TRACE((mcl_stdout, "   mcl_recvfrom: not an MCL id, switch to standard recvfrom\n"))
- 		return (recvfrom(id, (char*)buf, len, 0, saddr,
--#ifdef LINUX
-+#if defined(LINUX)
- 				(size_t*) /* linux => uint, solaris => int */
-+#elif defined(FREEBSD)
-+				(socklen_t*) 
- #endif
- 				saddr_len));
- 	}
-@@ -1520,8 +1522,11 @@
- 	if (id >= MCLCB_MAX_ID || (mclcb = mclcbs[id]) == NULL) {
- 		TRACE((mcl_stdout, "   mcl_recvfrom: not an MCL id, switch to standard recvfrom\n"))
- 		return (recvfrom(id, (char*)buf, len, 0, saddr,
--#ifdef LINUX
-+#if defined(LINUX)
- 				(size_t*) /* linux => uint, solaris => int */
-+#elif defined(FREEBSD)
-+				(socklen_t*)
-+
- #endif
- 				saddr_len));
- 	}
diff --git a/net/mcl/files/patch-mcl_network.cpp b/net/mcl/files/patch-mcl_network.cpp
deleted file mode 100644
index 6e5a8cfaebfe..000000000000
--- a/net/mcl/files/patch-mcl_network.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/alc/mcl_network.cpp.orig	Tue Jul 22 19:37:39 2003
-+++ src/alc/mcl_network.cpp	Tue Oct 14 15:47:45 2003
-@@ -414,8 +414,10 @@
- 				pkt->pkt_len = recvfrom(mg->ses_sock,
- 					pkt->get_buf(), pkt->get_buf_len(),
- 					0, &saddr,
--#ifdef LINUX
-+#if defined(LINUX)
- 					(size_t*)
-+#elif defined(FREEBSD)
-+					(socklen_t*)
- #endif
- 					&saddr_len);
- #ifdef WIN32
-@@ -483,8 +485,10 @@
- 			pkt->pkt_len = recvfrom(mg->priv_sock,
- 					pkt->get_buf(), pkt->get_buf_len(),
- 					0, &saddr,
--#ifdef LINUX
-+#if defined(LINUX)
- 					(size_t*)
-+#elif defined(FREEBSD)
-+					(socklen_t*)
- #endif
- 					&saddr_len);
- #ifdef WIN32
-@@ -663,8 +667,10 @@
- 		err = setsockopt(fd, SOL_SOCKET, buf, (char*)&val, sizeof(val));
- 	else
- 		err = getsockopt(fd, SOL_SOCKET, buf, (char*)&val,
--#ifdef LINUX
--				(size_t*) /* linux => uint, solaris => int */
-+#if defined(LINUX)
-+					(size_t*)
-+#elif defined(FREEBSD)
-+					(socklen_t*)
- #endif
- 				&len);
- 	if (err < 0) {
-@@ -938,7 +944,7 @@
- 
- 		if (mcl_is_valid_sock(mg->priv_sock) &&
- 		    getsockname(mg->priv_sock, (struct sockaddr *)&tmp_addr,
--#ifdef LINUX
-+#if defined(LINUX) || defined(FREEBSD)
- 				(socklen_t*)
- #endif
- 				&tmp_len) < 0) {
diff --git a/net/mcl/files/patch-mcl_osdep.h b/net/mcl/files/patch-mcl_osdep.h
deleted file mode 100644
index 1effff377a98..000000000000
--- a/net/mcl/files/patch-mcl_osdep.h
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/common/mcl_osdep.h.orig	Sun Dec  7 18:58:22 2003
-+++ src/common/mcl_osdep.h	Sun Dec  7 19:00:39 2003
-@@ -44,7 +44,7 @@
-  * bit field order is compiler/OS dependant
-  * With linux, see the above LINUX_XXX defines...
-  */
--#if defined(LINUX_I386) || defined(WIN32)
-+#if defined(LINUX_I386) || defined(WIN32) || defined (FREEBSD)
- #define _BIT_FIELDS_LTOH
- #undef _BIT_FIELDS_HTOL
- 
-@@ -58,7 +58,7 @@
- /*
-  * sighandler
-  */
--#if defined(LINUX)
-+#if defined(LINUX) || defined (FREEBSD)
- 	/* On Linux systems, signal handlers must be of __sighandler_t type */
- #define	sighandler_t	__sighandler_t
- 
-@@ -77,9 +77,9 @@
- #define u_int16_t	ushort_t	/* or uint16_t */
- #define u_int32_t	uint_t		/* or uint32_t */
- 
--#elif defined (WIN32) 
-+#elif defined (WIN32) || defined (FREEBSD)
- 
--/* u_xxx absent from WIN32! */
-+/* u_xxx absent from WIN32 and ulong absent from FreeBSD! */
- #define u_int8_t	unsigned char		/* or uint8_t */
- #define u_int16_t	unsigned short		/* or uint16_t */
- #define u_int32_t	unsigned int		/* or uint32_t */
diff --git a/net/mcl/files/patch-mcl_profile.h b/net/mcl/files/patch-mcl_profile.h
deleted file mode 100644
index 24408a4ddbfe..000000000000
--- a/net/mcl/files/patch-mcl_profile.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/alc/mcl_profile.h.orig	Tue Dec 16 23:47:58 2003
-+++ src/alc/mcl_profile.h	Tue Dec 16 23:48:09 2003
-@@ -130,7 +130,7 @@
- /*
-  * Do you want to use LDPC large block Forward Error Correction (FEC) ?
-  */
--#define LDPC_FEC
-+//#define LDPC_FEC
- 
- #if defined(RSE_FEC) || defined(LDPC_FEC)
- #define FEC
diff --git a/net/mcl/files/patch-mclftp-Makefile b/net/mcl/files/patch-mclftp-Makefile
deleted file mode 100644
index 0ddac0210fa9..000000000000
--- a/net/mcl/files/patch-mclftp-Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- mclftp/Makefile.orig	Wed Dec 17 00:13:34 2003
-+++ mclftp/Makefile	Wed Dec 17 00:15:56 2003
-@@ -36,6 +36,14 @@
- 	LIBRARIES = -lc -lm -lsocket -lnsl /usr/ucblib/libucb.a -lposix4 -lpthread
- endif
- 
-+ifeq (${OS},freebsd)
-+	# FreeBSD version
-+	# MCL library requires -pthread
-+	#
-+	BINDIR = ../bin/freebsd
-+	LIBRARIES = -lm -pthread
-+endif
-+
- 
- 
- ###### Other variables ######
diff --git a/net/mcl/files/patch-robcast-Makefile b/net/mcl/files/patch-robcast-Makefile
deleted file mode 100644
index f6f4a21f0e42..000000000000
--- a/net/mcl/files/patch-robcast-Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- robcast/Makefile.orig	Wed Oct 15 18:03:36 2003
-+++ robcast/Makefile	Wed Oct 15 17:33:36 2003
-@@ -29,6 +29,16 @@
- 	LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lposix4 -lpthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
- endif
- 
-+ifeq (${OS},freebsd)
-+	# FreeBSD version
-+	# MCL library requires -pthread
-+	#
-+	BINDIR = ../bin/freebsd
-+	LDPC_BINDIR = ../../ldpc/bin/freebsd
-+	LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a
-+	#LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
-+endif
-+
- 
- ###### Other variables ######
- 
diff --git a/net/mcl/files/patch-test_abort.c b/net/mcl/files/patch-test_abort.c
deleted file mode 100644
index ad1116943ab0..000000000000
--- a/net/mcl/files/patch-test_abort.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_abort.c.orig	Tue Jul 22 19:37:39 2003
-+++ check/alc/test_abort.c	Wed Oct 15 17:10:42 2003
-@@ -26,6 +26,10 @@
- #include <stdio.h>
- #include <stdlib.h>			/* for exit */
- 
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #include <io.h>
diff --git a/net/mcl/files/patch-test_demux_label1_rx.c b/net/mcl/files/patch-test_demux_label1_rx.c
deleted file mode 100644
index d172c016a3b0..000000000000
--- a/net/mcl/files/patch-test_demux_label1_rx.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_demux_label1_rx.c.orig	Tue Jul 22 19:37:39 2003
-+++ check/alc/test_demux_label1_rx.c	Wed Oct 15 17:13:17 2003
-@@ -26,6 +26,10 @@
- 
- #include <stdio.h>
- 
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_demux_label1_tx.c b/net/mcl/files/patch-test_demux_label1_tx.c
deleted file mode 100644
index 57e1efe5f915..000000000000
--- a/net/mcl/files/patch-test_demux_label1_tx.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_demux_label1_tx.c.orig	Tue Jul 22 19:37:39 2003
-+++ check/alc/test_demux_label1_tx.c	Wed Oct 15 17:12:56 2003
-@@ -25,6 +25,10 @@
- 
- #include <stdio.h>
- 
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_dyn_tsi.c b/net/mcl/files/patch-test_dyn_tsi.c
deleted file mode 100644
index bf09722b074f..000000000000
--- a/net/mcl/files/patch-test_dyn_tsi.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_dyn_tsi.c.orig	Tue Jul 22 19:37:39 2003
-+++ check/alc/test_dyn_tsi.c	Wed Oct 15 17:13:37 2003
-@@ -30,6 +30,10 @@
- 
- #include <stdio.h>
- 
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_multi_sessions1.c b/net/mcl/files/patch-test_multi_sessions1.c
deleted file mode 100644
index 0b0af22dd2b1..000000000000
--- a/net/mcl/files/patch-test_multi_sessions1.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- check/alc/test_multi_sessions1.c.orig	Tue Jul 22 19:37:39 2003
-+++ check/alc/test_multi_sessions1.c	Wed Oct 15 17:11:53 2003
-@@ -24,6 +24,11 @@
-  */
- 
- #include <stdio.h>
-+
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_multi_sessions2.c b/net/mcl/files/patch-test_multi_sessions2.c
deleted file mode 100644
index 0033a72b5a86..000000000000
--- a/net/mcl/files/patch-test_multi_sessions2.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- check/alc/test_multi_sessions2.c.orig	Tue Jul 22 19:37:39 2003
-+++ check/alc/test_multi_sessions2.c	Wed Oct 15 17:12:13 2003
-@@ -25,6 +25,11 @@
-  */
- 
- #include <stdio.h>
-+
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #include <io.h>
diff --git a/net/mcl/files/patch-test_no_tx.c b/net/mcl/files/patch-test_no_tx.c
deleted file mode 100644
index e6f1e0b90d83..000000000000
--- a/net/mcl/files/patch-test_no_tx.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_no_tx.c.orig	Tue Jul 22 19:37:39 2003
-+++ check/alc/test_no_tx.c	Wed Oct 15 17:10:20 2003
-@@ -25,6 +25,10 @@
- 
- #include <stdio.h>
- 
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_rebootable_client.c b/net/mcl/files/patch-test_rebootable_client.c
deleted file mode 100644
index 9ee9725b77a9..000000000000
--- a/net/mcl/files/patch-test_rebootable_client.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_rebootable_client.c.orig	Tue Jul 22 19:37:39 2003
-+++ check/alc/test_rebootable_client.c	Wed Oct 15 17:18:38 2003
-@@ -35,6 +35,10 @@
- #include <stdio.h>
- #include <string.h>
- 
-+#ifdef FREEBSD
-+#include <sys/time.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_seq_of_tx_sessions.c b/net/mcl/files/patch-test_seq_of_tx_sessions.c
deleted file mode 100644
index 31d967ca431e..000000000000
--- a/net/mcl/files/patch-test_seq_of_tx_sessions.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- check/alc/test_seq_of_tx_sessions.c.orig	Tue Jul 22 19:37:39 2003
-+++ check/alc/test_seq_of_tx_sessions.c	Wed Oct 15 17:11:13 2003
-@@ -25,6 +25,11 @@
-  */
- 
- #include <stdio.h>
-+
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_several_fec_codecs.c b/net/mcl/files/patch-test_several_fec_codecs.c
deleted file mode 100644
index 34da7be64644..000000000000
--- a/net/mcl/files/patch-test_several_fec_codecs.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_several_fec_codecs.c.orig	Tue Jul 22 19:37:39 2003
-+++ check/alc/test_several_fec_codecs.c	Wed Oct 15 17:05:40 2003
-@@ -28,6 +28,10 @@
- 
- #include <stdio.h>
- 
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_vtm_rx.c b/net/mcl/files/patch-test_vtm_rx.c
deleted file mode 100644
index a0cf05b33306..000000000000
--- a/net/mcl/files/patch-test_vtm_rx.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_vtm_rx.c.orig	Tue Jul 22 19:37:39 2003
-+++ check/alc/test_vtm_rx.c	Wed Oct 15 17:14:28 2003
-@@ -27,6 +27,10 @@
- 
- #include <stdio.h>
- 
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_vtm_tx.c b/net/mcl/files/patch-test_vtm_tx.c
deleted file mode 100644
index 8d26b0f60d2d..000000000000
--- a/net/mcl/files/patch-test_vtm_tx.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_vtm_tx.c.orig	Tue Jul 22 19:37:39 2003
-+++ check/alc/test_vtm_tx.c	Wed Oct 15 17:14:02 2003
-@@ -25,6 +25,10 @@
- 
- #include <stdio.h>
- 
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_wait_rx_receiver.c b/net/mcl/files/patch-test_wait_rx_receiver.c
deleted file mode 100644
index c03c4a4be206..000000000000
--- a/net/mcl/files/patch-test_wait_rx_receiver.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- check/alc/test_wait_rx_receiver.c.orig	Tue Jul 22 19:37:39 2003
-+++ check/alc/test_wait_rx_receiver.c	Wed Oct 15 17:09:56 2003
-@@ -27,6 +27,9 @@
- #include <stdio.h>
- 
- 
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
- 
- #ifdef WIN32
- #include <winsock2.h>
diff --git a/net/mcl/files/patch-test_wait_rx_sender.c b/net/mcl/files/patch-test_wait_rx_sender.c
deleted file mode 100644
index 694af55beed3..000000000000
--- a/net/mcl/files/patch-test_wait_rx_sender.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- check/alc/test_wait_rx_sender.c.orig	Tue Jul 22 19:37:39 2003
-+++ check/alc/test_wait_rx_sender.c	Wed Oct 15 17:09:33 2003
-@@ -27,6 +27,9 @@
- #include <stdio.h>
- 
- 
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
- 
- #ifdef WIN32
- #include <winsock2.h>
diff --git a/net/mcl/files/patch-test_wait_tx.c b/net/mcl/files/patch-test_wait_tx.c
deleted file mode 100644
index b0b816cc8cd8..000000000000
--- a/net/mcl/files/patch-test_wait_tx.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_wait_tx.c.orig	Tue Jul 22 19:37:39 2003
-+++ check/alc/test_wait_tx.c	Wed Oct 15 17:09:00 2003
-@@ -25,6 +25,10 @@
- 
- #include <stdio.h>
- 
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/pkg-descr b/net/mcl/pkg-descr
deleted file mode 100644
index 27a280bad227..000000000000
--- a/net/mcl/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-This is a port of MCLv3, an open source implementation of the ALC and 
-NORM Reliable Multicast Protocols.
-
-The MCLv3 project is an Open-Source GNU/GPL, multi-platform 
-implementation of the two major reliable multicast protocols being 
-standardized by the RMT IETF working group: ALC/LCT and NORM. It is 
-composed of a C/C++ library and several applications built on top of it 
-and provides an easy-to-use and integrated solution for reliable and 
-highly scalable multicast delivery of data.
-
-WWW: http://www.inrialpes.fr/planete/people/roca/mcl/mcl.html
-
-- Panagiotis Astithas
-past@noc.ntua.gr
diff --git a/net/mcl/pkg-plist b/net/mcl/pkg-plist
deleted file mode 100644
index 2e3b802a574e..000000000000
--- a/net/mcl/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/fcast
-bin/flute
-bin/robcast_client
-bin/robcast_server
-lib/libmclalc.a
-include/mcl_lib_api.h
-include/alc/mcl_lib_api_alc.h
-@dirrm include/alc
diff --git a/net/mldonkey-core-devel/Makefile b/net/mldonkey-core-devel/Makefile
deleted file mode 100644
index 1581942a353d..000000000000
--- a/net/mldonkey-core-devel/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# New ports collection makefile for:	mldonkey core
-# Date created:		Sun Jun 15 19:49:31 UTC 2003
-# Whom:		Holger Lamm <holger@e-gitt.net> and Mario S F Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-# build only the CORE
-WITHOUT_GUI=	yes
-
-COMMENT=	Client 'core' for the MLDonkey peer-to-peer network
-
-MASTERDIR=	${.CURDIR}/../mldonkey
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/mldonkey-devel/Makefile b/net/mldonkey-devel/Makefile
deleted file mode 100644
index 2baa242bac55..000000000000
--- a/net/mldonkey-devel/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-# New ports collection makefile for:	mldonkey
-# Date created:		21 August 2002
-# Whom:			Holger Lamm <holger@e-gitt.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mldonkey
-PORTVERSION=	2.5.16
-CATEGORIES+=	net
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
-
-MAINTAINER?=	holger@e-gitt.net
-COMMENT?=	A OCAML client for multiple peer-to-peer networks
-
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-pthread --enable-ocamlver=3
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GMAKE=	yes
-ALL_TARGET=	depend opt
-
-.if defined(WITHOUT_GUI)
-.if defined(WITHOUT_CORE)
-.error "Cool, you defined both WITHOUT_GUI and WITHOUT_CORE. I think I'll do nothing."
-.endif
-# have no 'without-' flag
-CONFIGURE_ARGS+=--disable-gui
-PLIST_SUB+=	CORE="" GUI="@comment " GUICORE="@comment "
-PKGNAMESUFFIX=	-core
-.else
-PLIST_SUB+=	GUI=""
-BUILD_DEPENDS+=	lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \
-		${LOCALBASE}/lib/ocaml/jabbr.cma:${PORTSDIR}/net/ocaml-jabbr
-# we don't need lablgtk as RUN dependency, but we need gtk+glib
-USE_GNOME=	gtk12
-.if defined(WITHOUT_CORE)
-PKGNAMESUFFIX=	-gui
-PLIST_SUB+=	CORE="@comment " GUICORE="@comment "
-.else
-PLIST_SUB+=	CORE=""	GUICORE=""
-.endif
-.endif
-
-DOCFILES=	Authors.txt Bugs.txt ChangeLog Developers.txt FAQ.html \
-		Install.txt Readme.txt Todo.txt ed2k_links.txt
-
-pre-everything::
-.if !defined(WITHOUT_GUI) && !defined(WITHOUT_CORE)
-	@${ECHO_MSG} "You can disable the GUI by defining WITHOUT_GUI."
-	@${ECHO_MSG} "You can disable the CORE by defining WITHOUT_CORE."
-.endif
-
-post-patch:
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
-		${WRKDIR}/wrapper.sh
-
-do-install:
-.ifndef(WITHOUT_CORE)
-	@${INSTALL_PROGRAM} ${WRKSRC}/mlnet		${PREFIX}/bin/mlnet-real
-	@${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh		${PREFIX}/bin/mlnet
-.endif
-.ifndef(WITHOUT_GUI)
-	@${INSTALL_PROGRAM} ${WRKSRC}/mlchat		${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/mlgui		${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/mlim		${PREFIX}/bin
-.endif
-.ifndef(WITHOUT_CORE && WITHOUT_GUI)
-	@${INSTALL_SCRIPT} ${WRKSRC}/distrib/mldonkey_previewer ${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter	${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui		${PREFIX}/bin
-.endif
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${DOCFILES}
-	@${INSTALL_DATA} ${WRKSRC}/distrib/${file} ${DOCSDIR}
-.endfor
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-install-user: extract
-.if !defined(LANG)
-	@${ECHO_MSG} "Please call as:  make install-user LANG=<lang>"
-	@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents,sp !"
-.else
-	@${CP} ${WRKSRC}/distrib/i18n/gui_messages.ini.${LANG}\
-		${HOME}/.mldonkey_gui_messages.ini
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/mldonkey-devel/distinfo b/net/mldonkey-devel/distinfo
deleted file mode 100644
index 382b8d9b7258..000000000000
--- a/net/mldonkey-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (mldonkey-2.5.16.tar.gz) = a64121509d6a7bb196fe0b5ce403c60b
-SIZE (mldonkey-2.5.16.tar.gz) = 3214587
diff --git a/net/mldonkey-devel/files/kill_mldonkey b/net/mldonkey-devel/files/kill_mldonkey
deleted file mode 100644
index 17a7de100aad..000000000000
--- a/net/mldonkey-devel/files/kill_mldonkey
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (c) 2003
-# Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-# Holger Lamm <holger@e-gitt.net>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-
-#!/bin/sh
-
-#
-# Add Username and password here
-# like this:
-#
-HTTPUSER="you"
-HTTPPASS="yourpassword"
-
-# Add location and port of mldonkey core
-HTTPURL="127.0.0.1:4080"
-
-# internal configuration
-HTTP_COMMAND="/usr/bin/fetch"
-HTTP_COMMAND_ARGS="-1 -q -s"
-
-if [ -n "${HTTPUSER}" -a -n "${HTTPPASS}" ]
-then
-	export HTTP_AUTH=basic:*:${HTTPUSER}:${HTTPPASS}
-fi
-
-${HTTP_COMMAND} ${HTTP_COMMAND_ARGS} "http://${HTTPURL}/submit?q=kill"
-
diff --git a/net/mldonkey-devel/files/wrapper.sh b/net/mldonkey-devel/files/wrapper.sh
deleted file mode 100644
index c25fd62bc133..000000000000
--- a/net/mldonkey-devel/files/wrapper.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-PREFIX="%%PREFIX%%/bin"
-PROGRAM="${0}"
-DIRNAME=${HOME}/.mldonkey
-
-if [ ! -d ${DIRNAME} ]
-then
-	mkdir -p ${DIRNAME}
-fi
-
-echo " ${*} " | grep " \-createdironly " ||
-{
-	cd ${DIRNAME} &&
-	echo Running under ${DIRNAME} &&
-	exec ${PREFIX}/${PROGRAM##*/}-real "${@}" ||
-	echo PROBLEM. Cannot create directory ${DIRNAME}, make sure you have the proper permissions to create it and try again
-}
diff --git a/net/mldonkey-devel/pkg-descr b/net/mldonkey-devel/pkg-descr
deleted file mode 100644
index 4fdcee9c079e..000000000000
--- a/net/mldonkey-devel/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-mldonkey is a OCAML/GTK client for a number of
-peer-to-peer networks.
-
-It is separated into a core with telnet and web interfaces, and
-a GTK GUI. 
-
-The following protocols are supported:
-- eDonkey        (http://www.edonkey2000.com/)
-- Overnet        (http://www.overnet.com/)
-- Bittorrent     (http://bitconjurer.org/BitTorrent/)
-- Gnutella       (http://www.gnutella.org/)
-- Gnutella2      (http://www.shareaza.com/)
-- Soulseek       (http://www.slsk.org/)
-- Direct-Connect (http://www.neo-modus.com/)
-- Opennap        (http://opennap.sourceforge.net/)
-
-WWW: http://www.mldonkey.org/
-     http://www.nongnu.org/mldonkey/
diff --git a/net/mldonkey-devel/pkg-message b/net/mldonkey-devel/pkg-message
deleted file mode 100644
index 9ec1ee80b84c..000000000000
--- a/net/mldonkey-devel/pkg-message
+++ /dev/null
@@ -1,27 +0,0 @@
-	ATTENTIONATTENTION:
-
-- If you want to know how to use mldonkey, read "INSTALL" or
-  "FAQ.html" in the port docs (/usr/local/share/doc/mldonkey)
-
-- It is not a bad idea to install mplayer. You will be able
-  to preview half-downloaded files (if you have the beginning).
-
-- You can import the downloads you started with eDonkey
-  (try "import /home/directory/path/.edonkey2000-core"
-  on the console), but you can NOT go back!
-
-- If this is the first time you install mldonkey,
-  please go to the mldonkey-gui ports dir as a user and enter:
-
-     make install-user
-
-  this will set up your user config.
-
-- You have to enable the different protocols on the client
-  console. Go to the (mldonkey-) console, and try the commands
-  'set enable_<protocol> true' (try 'voo' for reference).
-
-+------------------------------------------------------------+
-|- For upgraders: The names of the binaries have changed.    |
-|  Core and GUI are called "mlnet" and "mlgui", respectively.|
-+------------------------------------------------------------+
diff --git a/net/mldonkey-devel/pkg-plist b/net/mldonkey-devel/pkg-plist
deleted file mode 100644
index 46567757a145..000000000000
--- a/net/mldonkey-devel/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-%%CORE%%bin/kill_mldonkey
-%%CORE%%bin/mlnet
-%%CORE%%bin/mlnet-real
-%%GUICORE%%bin/mlguistarter
-%%GUICORE%%bin/mldonkey_previewer
-%%GUICORE%%bin/mlnet+gui
-%%GUI%%bin/mlchat
-%%GUI%%bin/mlgui
-%%GUI%%bin/mlim
-%%PORTDOCS%%share/doc/mldonkey/Authors.txt
-%%PORTDOCS%%share/doc/mldonkey/Bugs.txt
-%%PORTDOCS%%share/doc/mldonkey/ChangeLog
-%%PORTDOCS%%share/doc/mldonkey/Developers.txt
-%%PORTDOCS%%share/doc/mldonkey/FAQ.html
-%%PORTDOCS%%share/doc/mldonkey/Install.txt
-%%PORTDOCS%%share/doc/mldonkey/Readme.txt
-%%PORTDOCS%%share/doc/mldonkey/Todo.txt
-%%PORTDOCS%%share/doc/mldonkey/ed2k_links.txt
-%%PORTDOCS%%@dirrm share/doc/mldonkey
diff --git a/net/mldonkey-gui-devel/Makefile b/net/mldonkey-gui-devel/Makefile
deleted file mode 100644
index 975bbebf93c3..000000000000
--- a/net/mldonkey-gui-devel/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# New ports collection makefile for:	mldonkey
-# Date created:		19 December 2002
-# Whom:			Holger Lamm <holger@e-gitt.net>
-#
-# $FreeBSD$
-#
-
-# build only the GUI
-WITHOUT_CORE=	yes
-# unbreak index build with a common variable
-.undef WITHOUT_GUI
-
-COMMENT=	A OCAML/GTK GUI for the MLdonkey peer-to-peer network client
-
-MASTERDIR=	${.CURDIR}/../mldonkey
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/mldonkey-gui-devel/mldonkey-gui/Makefile b/net/mldonkey-gui-devel/mldonkey-gui/Makefile
deleted file mode 100644
index 975bbebf93c3..000000000000
--- a/net/mldonkey-gui-devel/mldonkey-gui/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# New ports collection makefile for:	mldonkey
-# Date created:		19 December 2002
-# Whom:			Holger Lamm <holger@e-gitt.net>
-#
-# $FreeBSD$
-#
-
-# build only the GUI
-WITHOUT_CORE=	yes
-# unbreak index build with a common variable
-.undef WITHOUT_GUI
-
-COMMENT=	A OCAML/GTK GUI for the MLdonkey peer-to-peer network client
-
-MASTERDIR=	${.CURDIR}/../mldonkey
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
deleted file mode 100644
index 880e5925a8c7..000000000000
--- a/net/mpich2/Makefile
+++ /dev/null
@@ -1,193 +0,0 @@
-# New ports collection makefile for:	mpich (portable mpi standard imp.)
-# Date created:		2 May 1998
-# Whom:                 dbader@ece.unm.edu
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mpich
-PORTVERSION=	1.2.5.2
-CATEGORIES=	net parallel
-MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/
-DIST_SUBDIR=	mpich
-
-MAINTAINER=	dbader@ece.unm.edu
-COMMENT=	Message Passing Interface (MPI) Library
-
-PATCH_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/patch/${PORTVERSION:R}/
-PATCHFILES=	8713 8697
-
-CONFIGURE_ARGS=	-cflags="${CFLAGS}" -prefix=${PREFIX}/mpich
-
-.if defined(WITHOUT_X11)
-WITHOUT_TK=	yes
-CONFIGURE_ARGS+=--disable-mpe_graphics
-PLIST_SUB+=	X11="@comment "
-.else
-USE_XLIB=	yes
-CONFIGURE_ARGS+=--enable-mpe_graphics
-PLIST_SUB+=	X11=""
-.endif
-
-.if defined(WITHOUT_TK)
-CONFIGURE_ARGS+=-mpe_opts="--without-tcldir --without-tkdir --without-wishloc"
-PLIST_SUB+=	TK="@comment "
-.else
-RUN_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
-BUILD_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
-CONFIGURE_ARGS+=-mpe_opts="--with-wishloc=wish8.4"
-PLIST_SUB+=	TK=""
-.endif
-
-.if defined(WITHOUT_JAVA)
-CONFIGURE_ARGS+= --without-java
-PLIST_SUB+=	JAVA="@comment "
-.else
-RUN_DEPENDS+=	javavm:${PORTSDIR}/java/javavmwrapper \
-		${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+=	javavm:${PORTSDIR}/java/javavmwrapper \
-		${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jdk13
-PLIST_SUB+=     JAVA=""
-.endif
-
-HAS_CONFIGURE=	yes
-
-.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= 		MPI.1 cleanipcs.1 mpiCC.1 mpicc.1 mpif77.1 mpif90.1 mpiman.1		\
-		mpireconfig.1 mpirun.1 Jumpshots.1 chp4_servs.1 tstmachines.1
-MAN3= 		MPI_File_get_position.3 MPI_File_preallocate.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_Allgatherv.3 MPI_Allreduce.3 MPI_Alltoall.3 MPI_Alltoallv.3		\
-		MPI_ERR_REQUEST.3 MPIO_Wait.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_init.3 MPI_Buffer_attach.3		\
-		MPI_Buffer_detach.3 MPI_CART.3 MPI_CHAR.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_Comm_compare.3	\
-		MPI_Comm_create.3 MPI_Comm_dup.3 MPI_Comm_free.3 MPI_Comm_group.3	\
-		MPI_Comm_get_name.3 MPI_Comm_rank.3 MPI_Comm_remote_size.3		\
-		MPI_Comm_size.3 MPI_Comm_split.3 MPI_Comm_set_name.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_ERROR.3 MPI_ERRORS_ARE_FATAL.3			\
-		MPI_ERRORS_RETURN.3 MPI_ERR_ARG.3 MPI_IO.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_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_OP.3 MPI_ERR_NULL.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_ROOT.3 MPI_ERR_TAG.3		\
-		MPI_ERR_TOPOLOGY.3 MPI_ERR_TRUNCATE.3 MPI_ERR_TYPE.3 MPI_ERR_UNKNOWN.3	\
-		MPI_Errhandler_free.3 MPI_Errhandler_get.3 MPI_Errhandler_set.3		\
-		MPI_FLOAT.3 MPI_GRAPH.3 MPI_Error_class.3 MPI_FLOAT_INT.3		\
-		MPI_Finalize.3 MPI_Gather.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_set_errhandler.3 MPI_File_get_info.3 MPI_File_iread.3		\
-		MPI_File_set_size.3 MPI_File_get_size.3 MPI_File_read.3			\
-		MPI_File_get_view.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_all.3 MPI_File_read_at_all_begin.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_ordered.3 MPI_Info_get_nthkey.3	\
-		MPI_File_read_ordered_begin.3 MPI_File_read_ordered_end.3		\
-		MPI_File_read_shared.3 MPI_File_seek.3 MPI_File_set_atomicity.3		\
-		MPI_File_set_info.3 MPI_File_write.3 MPI_File_sync.3			\
-		MPI_File_write_all.3 MPI_File_write_all_begin.3				\
-		MPI_File_write_all_end.3 MPI_HOST.3 MPI_File_write_at.3			\
-		MPI_File_write_at_all.3 MPI_File_write_at_all_end.3			\
-		MPI_Type_create_subarray.3 MPI_File_write_ordered.3			\
-		MPI_File_write_ordered_end.3 MPI_File_write_shared.3 MPI_Info_c2f.3	\
-		MPI_Info_create.3 MPI_GROUP_EMPTY.3 MPI_GROUP_NULL.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_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_Handler_function.3	\
-		MPI_IDENT.3 MPI_INT.3 MPI_INTEGER.3 MPI_INTEGER1.3 MPI_INTEGER2.3	\
-		MPI_INTEGER4.3 MPI_Ibsend.3 MPI_Info_delete.3 MPI_Info_dup.3		\
-		MPIO_Request_c2f.3 MPI_Info_f2c.3 MPI_Info_free.3 MPI_LB.3		\
-		MPI_Info_get_nkeys.3 MPI_Info_get_valuelen.3 MPI_File_get_errhandler.3	\
-		MPI_Info_set.3 MPI_Init.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_LOGICAL.3		\
-		MPI_LONG.3 MPI_LONG_DOUBLE.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_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_REAL8.3 MPI_REQUEST_NULL.3 MPI_Recv.3	\
-		MPI_Recv_init.3 MPI_Reduce.3 MPI_Rsend.3 MPI_Request_c2f.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_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_contiguous.3	\
-		MPI_Type_create_indexed_block.3 MPI_Init_thread.3 MPI_UB.3		\
-		MPI_Unpack.3 MPI_Type_free.3 MPI_Type_get_envelope.3			\
-		MPI_Type_hindexed.3 MPI_Type_hvector.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_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 Constants.3		\
-		MPI_2COMPLEX.3 MPI_2DOUBLE_COMPLEX.3 MPI_Allgather.3 MPI_Attr_delete.3	\
-		MPI_Bsend.3 MPI_COMM_NULL.3 MPI_Cartdim_get.3 MPI_Comm_remote_group.3	\
-		MPI_ERRHANDLER_NULL.3 MPI_ERR_BAD_ARGS.3 MPI_ERR_EXHAUSTED.3		\
-		MPI_ERR_OTHER.3 MPI_Errhandler_create.3 MPI_Error_string.3		\
-		MPI_Finalized.3 MPI_Graph_neighbors_count.3 MPI_Info_get.3		\
-		MPI_Type_create_darray.3 MPI_LONG_DOUBLE_INT.3 MPI_Op_free.3		\
-		MPI_REAL4.3 MPI_Reduce_scatter.3 MPI_Request_free.3 MPI_Startall.3	\
-		MPI_Type_commit.3 MPI_Type_extent.3 MPI_Type_get_contents.3		\
-		MPI_Type_indexed.3 MPI_File_c2f.3 MPI_File_close.3			\
-		MPI_File_get_position_shared.3 MPI_File_get_type_extent.3		\
-		MPI_File_read_at_all_end.3 MPI_File_seek_shared.3 MPI_File_set_view.3	\
-		MPI_File_write_ordered_begin.3 MPIO_Request_f2c.3			\
-		MPI_File_write_at_all_begin.3
-MAN4= 		CLOG_Init.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_msgtype.4 CLOG_procbuf.4 MPE.4	\
-		CLOG_newbuff.4 CLOG_reclen.4 CLOG_reinit_buff.4 CLOG_treesetup.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_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_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_Num_colors.4 MPE_Open_graphics.4 MPE_Print_datatype_pack_action.4	\
-		MPE_Seq_begin.4 MPE_Update.4 MPE_ReturnTags.4 MPE_Seq_end.4		\
-		MPE_Start_log.4 MPE_Stop_log.4 MPE_TagsEnd.4 CLOG_Finalize.4		\
-		CLOG_Output.4 CLOG_nodebuffer2disk.4 CLOG_rectype.4			\
-		MPE_Describe_event.4 MPE_Get_mouse_press.4 MPE_Make_color_array.4	\
-		MPE_Print_datatype_unpack_action.4
-INSTALL_TARGET=	install
-
-.include <bsd.port.post.mk>
diff --git a/net/mpich2/distinfo b/net/mpich2/distinfo
deleted file mode 100644
index 5b45cdd55427..000000000000
--- a/net/mpich2/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (mpich/mpich-1.2.5.2.tar.gz) = 9a7524c220eeb3f080069308bab9f487
-SIZE (mpich/mpich-1.2.5.2.tar.gz) = 12383519
-MD5 (mpich/8713) = 6039d7d76cd775c124148a8c7b631410
-SIZE (mpich/8713) = 87123
-MD5 (mpich/8697) = c8eab96712270242808b9f5b5cdecf9e
-SIZE (mpich/8697) = 286
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/files/patch-mpid::ch2::chtick.c b/net/mpich2/files/patch-mpid::ch2::chtick.c
deleted file mode 100644
index a12aee39f11f..000000000000
--- a/net/mpich2/files/patch-mpid::ch2::chtick.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- mpid/ch2/chtick.c-orig	Wed Apr  4 09:16:05 2001
-+++ mpid/ch2/chtick.c	Sat Aug 25 08:49:10 2001
-@@ -14,6 +14,7 @@
-       !defined(MPID_CH_Wtime)
- #define USING_POSIX_CLOCK
- #include <time.h>
-+#include <sys/time.h>
- #endif
- /* 
-    This returns a value that is correct but not the best value that
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 38e9ad8aae3d..000000000000
--- a/net/mpich2/pkg-plist
+++ /dev/null
@@ -1,562 +0,0 @@
-mpich/bin/clog2alog
-mpich/bin/clog2slog
-mpich/bin/clog_print
-mpich/bin/logviewer
-mpich/bin/mpereconfig
-mpich/bin/mpereconfig.dat
-mpich/bin/mpereconfig.in
-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/mpirun.rand
-mpich/bin/mpirun_dbg.dbx
-mpich/bin/mpirun_dbg.ddd
-mpich/bin/mpirun_dbg.gdb
-mpich/bin/mpirun_dbg.ladebug
-mpich/bin/mpirun_dbg.totalview
-mpich/bin/mpirun_dbg.xxgdb
-mpich/bin/serv_p4
-mpich/bin/slog_print
-mpich/bin/tarch
-mpich/bin/tdevice
-mpich/doc/mpeman.pdf
-mpich/doc/mpeman.ps.gz
-mpich/doc/mpichman-chp4.pdf
-mpich/doc/mpichman-chp4.ps.gz
-mpich/doc/mpichman-chp4mpd.pdf
-mpich/doc/mpichman-chp4mpd.ps.gz
-mpich/doc/mpichman-chshmem.pdf
-mpich/doc/mpichman-chshmem.ps.gz
-mpich/doc/mpichman-globus2.pdf
-mpich/doc/mpichman-globus2.ps.gz
-mpich/doc/mpiman.ps
-mpich/doc/romio-users.ps.gz
-mpich/etc/mpichconf.h.dat
-mpich/etc/mpichlib.conf
-mpich/etc/mpif77.conf
-mpich/etc/mpif90.conf
-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/include/basex11.h
-mpich/include/mpe.h
-mpich/include/mpe_graphics.h
-mpich/include/mpe_log.h
-mpich/include/mpeexten.h
-mpich/include/mpef.h
-mpich/include/mpetools.h
-mpich/include/mpi.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++/mpi2c++_config.h
-mpich/include/mpi2c++/mpi2c++_list.h
-mpich/include/mpi2c++/mpi2c++_map.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/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
-%%X11%%mpich/lib/libampe.a
-mpich/lib/libfmpich.a
-mpich/lib/liblmpe.a
-mpich/lib/libmpe.a
-%%X11%%mpich/lib/libmpe_nompi.a
-mpich/lib/libmpich.a
-mpich/lib/libmpichfsup.a
-mpich/lib/libpmpich++.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/examples/Makefile
-mpich/share/examples/Makefile.in
-mpich/share/examples/cpi.c
-mpich/share/examples/cpilog.c
-mpich/share/examples/cxgraphics.c
-mpich/share/examples/fpi.f
-mpich/share/examples/fxgraphics.f
-mpich/share/examples/mpirun
-mpich/share/examples/srtest.c
-%%JAVA%%mpich/share/jumpshot-3/README
-%%JAVA%%mpich/share/jumpshot-3/README.slog
-%%JAVA%%mpich/share/jumpshot-3/TourStepByStep.txt
-%%JAVA%%mpich/share/jumpshot-3/UserGuide.txt
-%%JAVA%%mpich/share/jumpshot-3/bin/jumpshot
-%%JAVA%%mpich/share/jumpshot-3/bin/slog_print
-%%JAVA%%mpich/share/jumpshot-3/doc/TourStepByStep.pdf
-%%JAVA%%mpich/share/jumpshot-3/doc/html/TourStepByStep.css
-%%JAVA%%mpich/share/jumpshot-3/doc/html/TourStepByStep.html
-%%JAVA%%mpich/share/jumpshot-3/doc/html/WARNINGS
-%%JAVA%%mpich/share/jumpshot-3/doc/html/crossref.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/footnode.html
-%%JAVA%%mpich/share/jumpshot-3/doc/html/images.aux
-%%JAVA%%mpich/share/jumpshot-3/doc/html/images.log
-%%JAVA%%mpich/share/jumpshot-3/doc/html/images.pl
-%%JAVA%%mpich/share/jumpshot-3/doc/html/images.tex
-%%JAVA%%mpich/share/jumpshot-3/doc/html/img1.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/img10.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/img11.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/img12.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/img13.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/img2.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/img3.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/img4.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/img5.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/img6.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/img7.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/img8.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/img9.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/index.html
-%%JAVA%%mpich/share/jumpshot-3/doc/html/internals.pl
-%%JAVA%%mpich/share/jumpshot-3/doc/html/labels.pl
-%%JAVA%%mpich/share/jumpshot-3/doc/html/next.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/next_g.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/node1.html
-%%JAVA%%mpich/share/jumpshot-3/doc/html/node2.html
-%%JAVA%%mpich/share/jumpshot-3/doc/html/node3.html
-%%JAVA%%mpich/share/jumpshot-3/doc/html/node4.html
-%%JAVA%%mpich/share/jumpshot-3/doc/html/node5.html
-%%JAVA%%mpich/share/jumpshot-3/doc/html/node6.html
-%%JAVA%%mpich/share/jumpshot-3/doc/html/node7.html
-%%JAVA%%mpich/share/jumpshot-3/doc/html/prev.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/prev_g.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/up.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/html/up_g.gif
-%%JAVA%%mpich/share/jumpshot-3/doc/jumpshot.def
-%%JAVA%%mpich/share/jumpshot-3/etc/jumpshot.conf
-%%JAVA%%mpich/share/jumpshot-3/lib/images.jar
-%%JAVA%%mpich/share/jumpshot-3/lib/jumpshot.jar
-%%JAVA%%mpich/share/jumpshot-3/lib/preview.jar
-%%JAVA%%mpich/share/jumpshot-3/lib/slog.jar
-%%JAVA%%mpich/share/jumpshot-3/lib/slog_print.class
-%%JAVA%%mpich/share/jumpshot-3/lib/slog_print_remote.class
-%%JAVA%%mpich/share/jumpshot-3/lib/statsviewer.jar
-%%JAVA%%mpich/share/jumpshot-3/logfiles/sample.slog
-%%JAVA%%mpich/share/jumpshot-3/logfiles/sppm.stats.0301
-%%JAVA%%mpich/share/jumpshot-3/logfiles/sppm_ic2a.slog
-%%JAVA%%mpich/share/jumpshot-3/logfiles/stats0204.txt
-%%JAVA%%mpich/share/jumpshot-3/logfiles/stats3.txt
-%%JAVA%%mpich/share/jumpshot-3/logfiles/thread1.stats
-%%JAVA%%mpich/share/jumpshot-3/sbin/exejar
-%%JAVA%%mpich/share/jumpshot-3/share/jumpshot.colors
-%%JAVA%%@dirrm mpich/share/jumpshot-3/share
-%%JAVA%%@dirrm mpich/share/jumpshot-3/sbin
-%%JAVA%%@dirrm mpich/share/jumpshot-3/logfiles
-%%JAVA%%@dirrm mpich/share/jumpshot-3/lib
-%%JAVA%%@dirrm mpich/share/jumpshot-3/etc
-%%JAVA%%@dirrm mpich/share/jumpshot-3/doc/html
-%%JAVA%%@dirrm mpich/share/jumpshot-3/doc
-%%JAVA%%@dirrm mpich/share/jumpshot-3/bin
-%%JAVA%%@dirrm mpich/share/jumpshot-3
-mpich/share/machines.freebsd
-mpich/share/machines.sample
-%%TK%%mpich/share/upshot/bin/upshot
-%%TK%%mpich/share/upshot/bitmaps/2x2
-%%TK%%mpich/share/upshot/bitmaps/black
-%%TK%%mpich/share/upshot/bitmaps/boxes
-%%TK%%mpich/share/upshot/bitmaps/dimple3
-%%TK%%mpich/share/upshot/bitmaps/dllines3
-%%TK%%mpich/share/upshot/bitmaps/dllines4
-%%TK%%mpich/share/upshot/bitmaps/drlines3
-%%TK%%mpich/share/upshot/bitmaps/drlines4
-%%TK%%mpich/share/upshot/bitmaps/gray
-%%TK%%mpich/share/upshot/bitmaps/gray2
-%%TK%%mpich/share/upshot/bitmaps/gray3
-%%TK%%mpich/share/upshot/bitmaps/hlines2
-%%TK%%mpich/share/upshot/bitmaps/hlines3
-%%TK%%mpich/share/upshot/bitmaps/hlines4
-%%TK%%mpich/share/upshot/bitmaps/light_gray
-%%TK%%mpich/share/upshot/bitmaps/vlines2
-%%TK%%mpich/share/upshot/bitmaps/vlines3
-%%TK%%mpich/share/upshot/bitmaps/vlines4
-%%TK%%mpich/share/upshot/bitmaps/white
-%%TK%%mpich/share/upshot/logfiles/fft.trf
-%%TK%%mpich/share/upshot/logfiles/sam_hyp.16.log
-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/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_get_name.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_set_name.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_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_Gather.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_Send_init.html
-mpich/www/www3/MPI_Sendrecv.html
-mpich/www/www3/MPI_Sendrecv_replace.html
-mpich/www/www3/MPI_Ssend.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_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_extent.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/www3/index.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_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/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
-mpich/www/www4/MPE_Update.html
-mpich/www/www4/index.html
-@dirrm mpich/www/www4
-@dirrm mpich/www/www3
-@dirrm mpich/www/www1
-@dirrm mpich/www
-%%TK%%@dirrm mpich/share/upshot/sbin
-%%TK%%@dirrm mpich/share/upshot/logfiles
-%%TK%%@dirrm mpich/share/upshot/bitmaps
-%%TK%%@dirrm mpich/share/upshot/bin
-%%TK%%@dirrm mpich/share/upshot
-@dirrm mpich/share/examples
-@dirrm mpich/share
-@dirrm mpich/sbin
-@dirrm mpich/man/man4
-@dirrm mpich/man/man3
-@dirrm mpich/man/man1
-@dirrm mpich/man
-@dirrm mpich/lib/shared
-@dirrm mpich/lib
-@dirrm mpich/include/mpi2c++
-@dirrm mpich/include
-@dirrm mpich/examples/MPI-2-C++
-@dirrm mpich/examples
-@dirrm mpich/etc
-@dirrm mpich/doc
-@dirrm mpich/bin
-@dirrm mpich
diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile
deleted file mode 100644
index 81bc965992e9..000000000000
--- a/net/netatalk-devel/Makefile
+++ /dev/null
@@ -1,119 +0,0 @@
-# Ports collection makefile for:    netatalk
-# Date created:         23 Jul 1997
-# Whom:                 stb
-#
-# $FreeBSD$
-#
-
-PORTNAME=	netatalk
-PORTVERSION=	1.6.4
-PORTREVISION=	1
-PORTEPOCH=	1
-CATEGORIES=	net print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	netatalk
-
-MAINTAINER=	marcus@FreeBSD.org
-COMMENT=	File and print server for AppleTalk networks
-
-.if !defined(WITHOUT_CNID)
-LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
-.endif
-.if defined(WITH_SRVLOC)
-LIB_DEPENDS+=	slp.1:${PORTSDIR}/net/openslp
-.endif
-
-USE_BZIP2=	yes
-CONFIGURE_ARGS+=	--with-tcp-wrappers \
-			--with-pkgconfdir=${PREFIX}/etc
-.if defined(WITH_PAM)
-CONFIGURE_ARGS+=	--with-pam=/etc/pam.d
-PLIST_SUB+=		NETATALKPAM=""
-.else
-CONFIGURE_ARGS+=	--without-pam
-PLIST_SUB+=		NETATALKPAM="@comment "
-.endif
-.if defined(WITH_SRVLOC)
-# Enable Service Location Protocol support.  This allows MacOS X < 10.1 to
-# pickup afpd servers in the network.
-CONFIGURE_ARGS+=	--enable-srvloc=${LOCALBASE}
-.endif
-.if defined(WITHOUT_CNID)
-# Configure old LAST DID support.  By default, the new CNID persistent DID
-# calculation scheme is used.  However, if you wish to revert back to the old
-# 1.5.x default scheme, specify WITHOUT_CNID
-CONFIGURE_ARGS+=	--with-did=last
-PLIST_SUB+=		NETATALKCNID="@comment "
-.else
-# This method of DID calculation is not persistent, but has been tested to
-# work with MacOS X (10.0.3-10.1.3) as well as MacOS 7-9.2.2.
-CONFIGURE_ARGS+=	--with-did=cnid \
-			--with-bdb=${LOCALBASE}
-PLIST_SUB+=		NETATALKCNID=""
-.endif
-.if defined (WITH_TIMELORD)
-CONFIGURE_ARGS+=	--enable-timelord
-PLIST_SUB+=		TIMELORD=""
-.else
-PLIST_SUB+=		TIMELORD="@comment "
-.endif
-.if defined (WITH_MANGLING) && !defined (WITHOUT_CNID)
-# Enable long file name mangling support (requires CNID).
-CONFIGURE_ARGS+=	--with-mangling
-.endif
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-USE_PERL5=	yes
-FILES=		AppleVolumes.default AppleVolumes.system afpd.conf \
-		atalkd.conf papd.conf
-LINKS=		unbin unhex unsingle hqx2bin single2bin macbinary \
-		binheader nadheader
-MAN1=		achfile.1 aecho.1 afile.1 afppasswd.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 acleandir.1 \
-		netatalk-config.1 timeout.1 apple_cp.1 apple_mv.1 \
-		apple_rm.1
-MAN3=		atalk_aton.3 nbp_name.3
-MAN4=		atalk.4
-MAN5=		AppleVolumes.default.5 afpd.conf.5 atalkd.conf.5 \
-		netatalk.conf.5 papd.conf.5
-MAN8=		afpd.8 atalkd.8 papd.8 papstatus.8 psf.8 timelord.8
-
-CONFLICTS=	bigloo-2.* cap-6.0.* tct-1.*
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Netatalk has the following tunable options:"
-	@${ECHO_MSG} "		WITHOUT_CNID=yes	Turns off CNID persistent DID support"
-	@${ECHO_MSG} "		WITH_SRVLOC=yes		Enable Service Location Protocol support"
-	@${ECHO_MSG} "		WITH_PAM=yes		Enable PAM support"
-	@${ECHO_MSG} "		WITH_TIMELORD=yes	Enable Timelord network time service"
-	@${ECHO_MSG} "		WITH_MANGLING=yes	Enable long file name mangling support (requires CNID)"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "See Netatalk's Makefile for more details on some of these options."
-	@${ECHO_MSG} ""
-
-post-extract:
-	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/netatalk.sh \
-		> ${WRKSRC}/netatalk.sh
-
-post-install:
-	@${RM} -f ${PREFIX}/bin/nu ${PREFIX}/bin/lp2pap.sh \
-		${PREFIX}/bin/test_parse_mtab \
-		${PREFIX}/bin/afpd-mtab.pl ${PREFIX}/etc/netatalk.conf.dist
-	${INSTALL_SCRIPT} ${WRKSRC}/netatalk.sh \
-		${PREFIX}/etc/rc.d/netatalk.sh.sample
-	${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \
-		${PREFIX}/bin/macusers
-.for i in ${FILES}
-	[ -f ${PREFIX}/etc/${i} ] || \
-		${INSTALL_DATA} -c ${PREFIX}/etc/${i}.dist ${PREFIX}/etc/${i}
-.endfor
-.for i in ${LINKS}
-	( cd ${PREFIX}/bin && ${LN} -sf megatron ${i} )
-.endfor
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/net/netatalk-devel/distinfo b/net/netatalk-devel/distinfo
deleted file mode 100644
index 962b01b6d35c..000000000000
--- a/net/netatalk-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (netatalk-1.6.4.tar.bz2) = 8bed0582d51deef7a31da1b6ae5df2e6
-SIZE (netatalk-1.6.4.tar.bz2) = 720436
diff --git a/net/netatalk-devel/files/netatalk.sh b/net/netatalk-devel/files/netatalk.sh
deleted file mode 100644
index 1ea9a2d094dc..000000000000
--- a/net/netatalk-devel/files/netatalk.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/net/netatalk-devel/files/Attic/netatalk.sh,v 1.1 2001-05-18 20:00:29 dinoex Exp $
-#
-# AppleTalk daemons. Make sure not to start atalkd in the background:
-# its data structures must have time to stablize before running the
-# other processes.
-#
-if ! test -x %%PREFIX%%/sbin/atalkd
-then
-#	exit 0
-fi
-HOSTNAME=`hostname|sed 's/\..*$//'`
-case $1 in
-start)
-	echo -n ' netatalk'
-	%%PREFIX%%/sbin/atalkd
-	%%PREFIX%%/bin/nbprgstr -p 4 ${HOSTNAME}:Workstation &
-	%%PREFIX%%/bin/nbprgstr -p 4 ${HOSTNAME}:netatalk &
-	%%PREFIX%%/sbin/papd
-	%%PREFIX%%/sbin/afpd -s %%PREFIX%%/etc/AppleVolumes.system \
-		-f %%PREFIX%%/etc/AppleVolumes.default
-	;;
-stop)
-	killall afpd
-	killall papd
-	killall atalkd
-	;;
-*)
-	echo "Usage: $0: [ start | stop ]" 2>&1
-	exit 65
-	;;
-esac
diff --git a/net/netatalk-devel/files/patch-config_Makefile.in b/net/netatalk-devel/files/patch-config_Makefile.in
deleted file mode 100644
index 54f7d74bb764..000000000000
--- a/net/netatalk-devel/files/patch-config_Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
---- config/Makefile.in.orig	Tue Dec  2 15:19:05 2003
-+++ config/Makefile.in	Sun Dec  7 13:29:53 2003
-@@ -378,23 +378,11 @@
- install-config-files: $(CONFFILES) $(GENFILES)
- 	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
- 	for f in $(CONFFILES) $(GENFILES); do \
--		if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
--			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
--			$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \
--		else \
--			echo "not overwriting $$f"; \
--		fi; \
-+		echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist"; \
-+		$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
- 	done
- 
- @USE_PAM_TRUE@install-data-local: install-config-files $(PAMFILES)
--@USE_PAM_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pamdir)
--@USE_PAM_TRUE@	if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pamdir)/netatalk; then \
--@USE_PAM_TRUE@		echo "$(INSTALL_DATA) netatalk.pamd $(DESTDIR)$(pamdir)/netatalk"; \
--@USE_PAM_TRUE@		$(INSTALL_DATA) netatalk.pamd $(DESTDIR)$(pamdir)/netatalk || \
--@USE_PAM_TRUE@		echo "WARNING: Can't install PAM file";            \
--@USE_PAM_TRUE@	else \
--@USE_PAM_TRUE@		echo "not overwriting $(DESTDIR)$(pamdir)/netatalk"; \
--@USE_PAM_TRUE@	fi;
- 
- @USE_PAM_FALSE@install-data-local: install-config-files
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/net/netatalk-devel/files/patch-configure b/net/netatalk-devel/files/patch-configure
deleted file mode 100644
index 713d43ec0079..000000000000
--- a/net/netatalk-devel/files/patch-configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- configure.orig	Mon Jun  9 11:55:15 2003
-+++ configure	Fri Jun 20 00:05:06 2003
-@@ -13327,13 +13327,13 @@
- 			savedldflags="$LDFLAGS"
- 			CFLAGS="$CFLAGS -I$bdbdir"
- 			LDFLAGS="-L$bdblibdir $LDFLAGS"
--			echo "$as_me:$LINENO: checking for main in -ldb" >&5
--echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
-+			echo "$as_me:$LINENO: checking for main in -ldb3" >&5
-+echo $ECHO_N "checking for main in -ldb3... $ECHO_C" >&6
- if test "${ac_cv_lib_db_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb3  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -13384,7 +13384,7 @@
- 				if test "$bdblibdir" != "/usr/lib"; then
- 				    BDB_LIBS="-L$bdblibdir"
- 				fi
--				BDB_LIBS="$BDB_LIBS -ldb"
-+				BDB_LIBS="$BDB_LIBS -ldb3"
- 				BDB_BIN=$bdbbindir
- 				BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`"
- 				BDB_PATH="`echo $BDB_PATH | sed 's,include$,,'`"
diff --git a/net/netatalk-devel/files/patch-etc_afpd_unix.h b/net/netatalk-devel/files/patch-etc_afpd_unix.h
deleted file mode 100644
index cfc566530256..000000000000
--- a/net/netatalk-devel/files/patch-etc_afpd_unix.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- etc/afpd/unix.h.orig	Sun Sep  8 23:45:56 2002
-+++ etc/afpd/unix.h	Mon Sep  9 00:03:58 2002
-@@ -30,7 +30,8 @@
- #if defined(TRU64)
- #define f_frsize f_fsize
- #else /* TRU64 */
--#if defined(HAVE_SYS_STATVFS_H) || defined(__svr4__)
-+#if (defined(HAVE_SYS_STATVFS_H) || defined(__svr4__)) && \
-+    !defined(__FreeBSD__)
- #include <sys/statvfs.h>
- #define statfs statvfs
- #else /* HAVE_SYS_STATVFS || __svr4__ */
diff --git a/net/netatalk-devel/files/patch-ltmain.sh b/net/netatalk-devel/files/patch-ltmain.sh
deleted file mode 100644
index 786e33b951ac..000000000000
--- a/net/netatalk-devel/files/patch-ltmain.sh
+++ /dev/null
@@ -1,34 +0,0 @@
---- ltmain.sh.orig	Sat Nov 29 08:54:27 2003
-+++ ltmain.sh	Sun Dec  7 13:32:36 2003
-@@ -1286,7 +1286,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1913,6 +1913,9 @@
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    fi
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
- 	    ;;
-@@ -5474,10 +5477,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net/netatalk-devel/pkg-descr b/net/netatalk-devel/pkg-descr
deleted file mode 100644
index 6d49d2583a0b..000000000000
--- a/net/netatalk-devel/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-netatalk - File and Print Server for AppleTalk networks
-
-Netatalk 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.
-
-This version includes Adrian Sun's improvements:
-o Access to the file server via AFP-over-TCP.
-o Support for volumes larger that 2GB.
-o Randnum- and 2-Way Randnum authentication methods (courtesy S. Hirsch)
-o Support for Apple II ProDOS.
-o A number of bug fixes.
-
-Many other new features and bug fixes have also been integrated.
-Requires AppleTalk support in the kernel (FreeBSD 2.2 or newer).
-
-WWW: http://netatalk.sourceforge.net/
diff --git a/net/netatalk-devel/pkg-message b/net/netatalk-devel/pkg-message
deleted file mode 100644
index 23d91dbf7b03..000000000000
--- a/net/netatalk-devel/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-###
-If you compiled WITH_PAM support, you need to edit /etc/pam.conf to add
-support for netatalk.  To do so, add the following three lines to this
-file:
-
-netatalk	auth	required	pam_unix.so	try_first_pass
-netatalk	account	required	pam_unix.so	try_first_pass
-netatalk	session	required	pam_permit.so
-###
diff --git a/net/netatalk-devel/pkg-plist b/net/netatalk-devel/pkg-plist
deleted file mode 100644
index d6ee6d5924e9..000000000000
--- a/net/netatalk-devel/pkg-plist
+++ /dev/null
@@ -1,145 +0,0 @@
-bin/achfile
-bin/acleandir.rc
-bin/add_netatalk_printer
-bin/adv1tov2
-bin/aecho
-bin/afile
-bin/afppasswd
-bin/apple_cp
-bin/apple_mv
-bin/apple_rm
-bin/cleanappledouble.pl
-bin/getzones
-bin/macusers
-bin/makecode
-bin/megatron
-@unexec rm -f %B/unbin
-@unexec rm -f %B/unhex
-@unexec rm -f %B/unsingle
-@unexec rm -f %B/hqx2bin
-@unexec rm -f %B/single2bin
-@unexec rm -f %B/macbinary
-@unexec rm -f %B/binheader
-@unexec rm -f %B/nadheader
-@exec cd %B && ln -s megatron unbin
-@exec cd %B && ln -s megatron unhex
-@exec cd %B && ln -s megatron unsingle
-@exec cd %B && ln -s megatron hqx2bin
-@exec cd %B && ln -s megatron single2bin
-@exec cd %B && ln -s megatron macbinary
-@exec cd %B && ln -s megatron binheader
-@exec cd %B && ln -s megatron nadheader
-%%NETATALKCNID%%bin/cnid_maint
-bin/nbplkup
-bin/nbprgstr
-bin/nbpunrgstr
-bin/netatalk-config
-bin/netatalkshorternamelinks.pl
-bin/pap
-bin/papstatus
-bin/parsecode
-bin/psorder
-bin/timeout
-sbin/afpd
-sbin/atalkd
-sbin/etc2ps.sh
-sbin/ifmpap
-sbin/ifmpaprev
-sbin/ifpap
-sbin/ifpaprev
-sbin/ifwmpap
-sbin/ifwmpaprev
-sbin/ifwpap
-sbin/ifwpaprev
-sbin/ofmpap
-sbin/ofpap
-sbin/ofwmpap
-sbin/ofwpap
-sbin/papd
-sbin/psa
-sbin/psf
-sbin/tfmpap
-sbin/tfmpaprev
-sbin/tfpap
-sbin/tfpaprev
-sbin/tfwmpap
-sbin/tfwmpaprev
-sbin/tfwpap
-sbin/tfwpaprev
-%%TIMELORD%%sbin/timelord
-@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
-@exec [ ! -f %B/AppleVolumes.default ] && cp %B/%f %B/AppleVolumes.default
-@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
-@exec [ ! -f %B/AppleVolumes.system ] && cp %B/%f %B/AppleVolumes.system
-@unexec if cmp -s %D/etc/afpd.conf %D/etc/afpd.conf.dist; then rm -f %D/etc/afpd.conf; fi
-etc/afpd.conf.dist
-@exec [ ! -f %B/afpd.conf ] && cp %B/%f %B/afpd.conf
-@unexec if cmp -s %D/etc/atalkd.conf %D/etc/atalkd.conf.dist; then rm -f %D/etc/atalkd.conf; fi
-etc/atalkd.conf.dist
-@exec [ ! -f %B/atalkd.conf ] && cp %B/%f %B/atalkd.conf
-@unexec if cmp -s %D/etc/papd.conf %D/etc/papd.conf.dist; then rm -f %D/etc/papd.conf; fi
-etc/papd.conf.dist
-@exec [ ! -f %B/papd.conf ] && cp %B/%f %B/papd.conf
-etc/nls/maccode.437
-etc/nls/maccode.850
-etc/nls/maccode.iso8859-1
-etc/nls/maccode.iso8859-1.adapted
-etc/nls/maccode.koi8-r
-etc/rc.d/netatalk.sh.sample
-etc/uams/uams_clrtxt.so
-etc/uams/uams_dhx.so
-%%NETATALKPAM%%etc/uams/uams_dhx_pam.so
-%%NETATALKPAM%%etc/uams/uams_dhx_pam.a
-etc/uams/uams_dhx_passwd.so
-etc/uams/uams_dhx_passwd.a
-etc/uams/uams_guest.so
-etc/uams/uams_guest.a
-%%NETATALKPAM%%etc/uams/uams_pam.so
-%%NETATALKPAM%%etc/uams/uams_pam.a
-etc/uams/uams_passwd.so
-etc/uams/uams_passwd.a
-etc/uams/uams_randnum.so
-etc/uams/uams_randnum.a
-@dirrm etc/nls
-@dirrm etc/uams
-include/atalk/adouble.h
-include/atalk/aep.h
-include/atalk/afp.h
-include/atalk/asp.h
-include/atalk/atp.h
-include/atalk/boolean.h
-include/atalk/cnid.h
-include/atalk/compat.h
-include/atalk/ddp.h
-include/atalk/dsi.h
-include/atalk/logger.h
-include/atalk/nbp.h
-include/atalk/netddp.h
-include/atalk/pap.h
-include/atalk/paths.h
-include/atalk/rtmp.h
-include/atalk/server_child.h
-include/atalk/uam.h
-include/atalk/util.h
-include/atalk/zip.h
-include/netatalk/aarp.c
-include/netatalk/aarp.h
-include/netatalk/at.h
-include/netatalk/at_control.c
-include/netatalk/at_proto.c
-include/netatalk/at_var.h
-include/netatalk/ddp.h
-include/netatalk/endian.h
-include/netatalk/ddp_var.h
-include/netatalk/ddp_input.c
-include/netatalk/ddp_output.c
-include/netatalk/ddp_usrreq.c
-include/netatalk/phase2.h
-@dirrm include/atalk
-@dirrm include/netatalk
-lib/libatalk.a
-share/aclocal/netatalk.m4
-share/netatalk/pagecount.ps
-@dirrm share/netatalk
diff --git a/net/netwib/Makefile b/net/netwib/Makefile
deleted file mode 100644
index 4e4030b11a0a..000000000000
--- a/net/netwib/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:	lcrzo
-# Date created:		Wed Apr 10 02:42:20 CEST 2002
-# Whom:			king@v2project.com
-#
-# $FreeBSD$
-#
-
-PORTNAME=	lcrzo
-PORTVERSION=	4.17.0
-CATEGORIES=	security
-MASTER_SITES=	http://www.laurentconstantin.com/common/lcrzo/download/v4/ \
-		http://www.mirrors.wiretapped.net/security/packet-construction/lcrzo/ \
-		ftp://ftp.mirrors.wiretapped.net/sd3a/security/packet-construction/lcrzo/
-EXTRACT_SUFX=	-src.tgz
-
-MAINTAINER=	king@v2project.com
-COMMENT=	Lcrzo is a network library (used by Lcrzoex, network testing toolbox)
-
-WRKSRC=		${WRKDIR}/${PKGNAME}-src/src
-ONLY_FOR_ARCHS=	i386 alpha
-
-MAN3=	lcrzo.3 lcrzo_address.3 lcrzo_conf.3 lcrzo_data.3 lcrzo_device.3 \
-	lcrzo_error.3 lcrzo_file.3 lcrzo_global.3 lcrzo_header.3 \
-	lcrzo_icmp.3 lcrzo_ipc.3 lcrzo_ipopt.3 lcrzo_list.3 lcrzo_misc.3 \
-	lcrzo_obso.3 lcrzo_packet.3 lcrzo_print.3 lcrzo_process.3 \
-	lcrzo_record.3 lcrzo_sniff.3 lcrzo_sock.3 lcrzo_spoof.3 \
-	lcrzo_string.3 lcrzo_tcpopt.3 lcrzo_time.3 lcrzo_types.3 lcrzo_wait.3 \
-	lcrzo_fd2.3 lcrzo_winhandle.3 lcrzo_kbd.3
-
-post-patch:
-	cd ${WRKSRC} && ${SH} ${WRKSRC}/genemake
-
-.include <bsd.port.mk>
diff --git a/net/netwib/distinfo b/net/netwib/distinfo
deleted file mode 100644
index 9cd62c23cb14..000000000000
--- a/net/netwib/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (lcrzo-4.17.0-src.tgz) = 042fcf6ee956b871e607d2686655ba29
-SIZE (lcrzo-4.17.0-src.tgz) = 765067
diff --git a/net/netwib/files/patch-config.dat b/net/netwib/files/patch-config.dat
deleted file mode 100644
index 81a6271d29ad..000000000000
--- a/net/netwib/files/patch-config.dat
+++ /dev/null
@@ -1,14 +0,0 @@
---- config.dat.orig	Wed Apr 10 03:06:53 2002
-+++ config.dat	Wed Apr 10 03:07:04 2002
-@@ -41,9 +41,9 @@
- ###  - MacOS_10_ppc : MacOS X under PowerPC
- ###  - Etc.
- #LCRZODEF_SYS=FreeBSD_3_i386
--#LCRZODEF_SYS=FreeBSD_4_i386
-+LCRZODEF_SYS=FreeBSD_4_i386
- #LCRZODEF_SYS=FreeBSD_4_alpha
--LCRZODEF_SYS=Linux_X_i386
-+#LCRZODEF_SYS=Linux_X_i386
- #LCRZODEF_SYS=Linux_X_ia64
- #LCRZODEF_SYS=Linux_X_alpha
- #LCRZODEF_SYS=MacOS_10_ppc
diff --git a/net/netwib/pkg-descr b/net/netwib/pkg-descr
deleted file mode 100644
index c25343d904f7..000000000000
--- a/net/netwib/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Lcrzo is a network library, for network administrators 
-and network hackers. Its objective is to easily create network programs.
-This library provides network functionnalities for Ethernet, IP, UDP, TCP, 
-ICMP, ARP and RARP protocols. It supports spoofing, sniffing, client and 
-server creation. Furthermore, lcrzo contains high level functions dealing 
-with data storage and handling. Using all these functions, you can quickly 
-create a network test program.
-
-WWW: http://www.laurentconstantin.com/en/lcrzo/
diff --git a/net/netwib/pkg-plist b/net/netwib/pkg-plist
deleted file mode 100644
index f2b2995e7bb2..000000000000
--- a/net/netwib/pkg-plist
+++ /dev/null
@@ -1,34 +0,0 @@
-bin/lcrzo-config
-include/lcrzo.h
-include/lcrzo_address.h
-include/lcrzo_conf.h
-include/lcrzo_data.h
-include/lcrzo_debugdefs.h
-include/lcrzo_defs.h
-include/lcrzo_device.h
-include/lcrzo_error.h
-include/lcrzo_fd2.h
-include/lcrzo_file.h
-include/lcrzo_global.h
-include/lcrzo_header.h
-include/lcrzo_icmp.h
-include/lcrzo_ipc.h
-include/lcrzo_ipopt.h
-include/lcrzo_kbd.h
-include/lcrzo_list.h
-include/lcrzo_misc.h
-include/lcrzo_obso.h
-include/lcrzo_packet.h
-include/lcrzo_print.h
-include/lcrzo_process.h
-include/lcrzo_record.h
-include/lcrzo_sniff.h
-include/lcrzo_sock.h
-include/lcrzo_spoof.h
-include/lcrzo_string.h
-include/lcrzo_tcpopt.h
-include/lcrzo_time.h
-include/lcrzo_types.h
-include/lcrzo_wait.h
-include/lcrzo_winhandle.h
-lib/liblcrzo.a
diff --git a/net/ns2/Makefile b/net/ns2/Makefile
deleted file mode 100644
index 7c843d92113a..000000000000
--- a/net/ns2/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# New ports collection makefile for: ns-2
-# Date created:		26 April 1999
-# Whom:			obonilla
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ns
-PORTVERSION=	2.27
-CATEGORIES=	net
-MASTER_SITES=	http://www.isi.edu/nsnam/dist/
-DISTNAME=	ns-src-2.27
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The UCB/LBNL Network Simulator Version 2
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
-RUN_DEPENDS=	${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84
-
-MAN1=		ns.1
-MANCOMPRESSED=	no
-
-WRKSRC=		${WRKDIR}/ns-2.27
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl-ver=8.4 --with-tk-ver=8.4
-
-ALL_TARGET=
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "alpha" && ${OSVERSION} < 500000
-BROKEN=		"Does not compile on alpha 4.x"
-.endif
-
-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.post.mk>
diff --git a/net/ns2/distinfo b/net/ns2/distinfo
deleted file mode 100644
index eeaad4beaa7a..000000000000
--- a/net/ns2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (ns-src-2.27.tar.gz) = db3a16e450f66a5e4dd881349ccc5dd7
-SIZE (ns-src-2.27.tar.gz) = 44642525
diff --git a/net/ns2/files/patch-Makefile.in b/net/ns2/files/patch-Makefile.in
deleted file mode 100644
index ed8faecfd51c..000000000000
--- a/net/ns2/files/patch-Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.in.orig	Thu Mar 11 00:22:57 2004
-+++ Makefile.in	Thu Mar 11 00:26:46 2004
-@@ -60,14 +60,15 @@
- DEFINE	= -DTCP_DELAY_BIND_ALL -DNO_TK @V_DEFINE@ @V_DEFINES@ @DEFS@ -DNS_DIFFUSION -DSMAC_NO_SYNC -DCPP_NAMESPACE=@CPP_NAMESPACE@ -DUSE_SINGLE_ADDRESS_SPACE -Drng_test
- 
- INCLUDES = \
--	-I. @V_INCLUDE_X11@ \
--	@V_INCLUDES@ \
-+	-I. \
- 	-I./tcp -I./sctp -I./common -I./link -I./queue \
- 	-I./adc -I./apps -I./mac -I./mobile -I./trace \
- 	-I./routing -I./tools -I./classifier -I./mcast \
- 	-I./diffusion3/lib/main -I./diffusion3/lib \
- 	-I./diffusion3/lib/nr -I./diffusion3/ns \
--	-I./diffusion3/filter_core -I./asim/ -I./qs
-+	-I./diffusion3/filter_core -I./asim/ -I./qs \
-+	@V_INCLUDE_X11@ \
-+	@V_INCLUDES@ 
- 
- 
- LIB	= \
diff --git a/net/ns2/pkg-descr b/net/ns2/pkg-descr
deleted file mode 100644
index 458652a19b35..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.isi.edu/nsnam/ns/
-
--Oscar <obonilla@fisicc-ufm.edu>
diff --git a/net/ns2/pkg-plist b/net/ns2/pkg-plist
deleted file mode 100644
index a6d579b2d6fd..000000000000
--- a/net/ns2/pkg-plist
+++ /dev/null
@@ -1,119 +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/diffusion-prob-run.tcl
-share/examples/ns2/diffusion-rate-run.tcl
-share/examples/ns2/dumbbell.tcl
-share/examples/ns2/example.tcl
-share/examples/ns2/flooding-run.tcl
-share/examples/ns2/fq-cbr.tcl
-share/examples/ns2/fq.tcl
-share/examples/ns2/grid2.tcl
-share/examples/ns2/gridkeeper.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/large-scale-web-traffic-old.tcl
-share/examples/ns2/large-scale-web-traffic.tcl
-share/examples/ns2/large-sim.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/miptest.tcl
-share/examples/ns2/nam-example-em.tcl
-share/examples/ns2/nam-example.tcl
-share/examples/ns2/nam-large-flowid.tcl
-share/examples/ns2/nam-separate-trace.tcl
-share/examples/ns2/nam-simplexlink.tcl
-share/examples/ns2/omni-run.tcl
-share/examples/ns2/pkts.tcl
-share/examples/ns2/ranvar.tcl
-share/examples/ns2/rbp_demo.tcl
-share/examples/ns2/rc.tcl
-share/examples/ns2/redlight.tcl
-share/examples/ns2/rng-test.tcl
-share/examples/ns2/rng-test2.tcl
-share/examples/ns2/route-gen.tcl
-share/examples/ns2/sat-aloha.tcl
-share/examples/ns2/sat-iridium-links.tcl
-share/examples/ns2/sat-iridium-nodes.tcl
-share/examples/ns2/sat-iridium.tcl
-share/examples/ns2/sat-mixed.tcl
-share/examples/ns2/sat-repeater.tcl
-share/examples/ns2/sat-teledesic-links.tcl
-share/examples/ns2/sat-teledesic-nodes.tcl
-share/examples/ns2/sat-teledesic.tcl
-share/examples/ns2/sat-wired.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-fsm-tcp.tcl
-share/examples/ns2/simple-heap.tcl
-share/examples/ns2/simple-plm.tcl
-share/examples/ns2/simple-rtg.tcl
-share/examples/ns2/simple-rtp.tcl
-share/examples/ns2/simple-tcp.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-wireless.tcl
-share/examples/ns2/simple.tcl
-share/examples/ns2/src_test.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/t1000.tcl
-share/examples/ns2/tcp-et.tcl
-share/examples/ns2/tcp-int.tcl
-share/examples/ns2/tcpapp.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/trace-driven.tcl
-share/examples/ns2/udpdata.tcl
-share/examples/ns2/varybell.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/web-traffic-embobj.tcl
-share/examples/ns2/web-traffic.tcl
-share/examples/ns2/wired-cum-wireless-sim.tcl
-share/examples/ns2/wireless-demo-csci694.tcl
-share/examples/ns2/wireless-dsdv-newnode.tcl
-share/examples/ns2/wireless-landmark.tcl
-share/examples/ns2/wireless-mip-test.tcl
-share/examples/ns2/wireless-mitf.tcl
-share/examples/ns2/wireless-newnode-energy.tcl
-share/examples/ns2/wireless-pkt-demo.tcl
-share/examples/ns2/wireless-shadowing-test.tcl
-share/examples/ns2/wireless-shadowing-vis-test.tcl
-share/examples/ns2/wireless-test.tcl
-share/examples/ns2/wireless.tcl
-share/examples/ns2/worm.tcl
-@dirrm share/examples/ns2
diff --git a/net/ntp-stable/Makefile b/net/ntp-stable/Makefile
deleted file mode 100644
index 3d2dd950b38e..000000000000
--- a/net/ntp-stable/Makefile
+++ /dev/null
@@ -1,41 +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.2.0
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ \
-		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ \
-		ftp://ftp.archive.de.uu.net/pub/unix/ntp/ntp4/ \
-		ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/ntp/ntp4/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
-
-MAINTAINER=	cy@FreeBSD.org
-COMMENT=	The Network Time Protocol Distribution
-
-LATEST_LINK=	${PORTNAME}
-# 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}
-
-.if defined(ENABLE_RAWDCF)
-CONFIGURE_ARGS+=	--enable-RAWDCF
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/ntp
-	${TAR} -C ${WRKSRC}/html -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 78ae64415558..000000000000
--- a/net/ntp-stable/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (ntp-4.2.0.tar.gz) = 0f8fabe87cf54f409b57c6283f0c0c3d
-SIZE (ntp-4.2.0.tar.gz) = 2514502
diff --git a/net/ntp-stable/files/patch-Makefile.in b/net/ntp-stable/files/patch-Makefile.in
deleted file mode 100644
index 7829972e1366..000000000000
--- a/net/ntp-stable/files/patch-Makefile.in
+++ /dev/null
@@ -1,40 +0,0 @@
---- Makefile.in.orig	Wed Oct 15 02:01:51 2003
-+++ Makefile.in	Mon Apr 19 22:01:44 2004
-@@ -224,7 +224,7 @@
- 	version
- 
- 
--DISTCLEANFILES = .warning
-+DISTCLEANFILES = .gcc-warning
- 
- #ETAGS_ARGS = $(srcdir)/Makefile.am $(srcdir)/configure.in
- ETAGS_ARGS = Makefile.am configure.in
-@@ -232,8 +232,8 @@
- # HMS: make ports be the last directory...
- # DIST_HOOK_DIRS = conf html scripts ports
- 
--# HMS: Keep .warning first, as that way it gets printed first.
--BUILT_SOURCES = .warning $(srcdir)/COPYRIGHT $(srcdir)/version
-+# HMS: Keep .gcc-warning first, as that way it gets printed first.
-+BUILT_SOURCES = .gcc-warning $(srcdir)/COPYRIGHT $(srcdir)/version
- 
- 
- # HMS: The following seems to be a work-in-progress...
-@@ -672,7 +672,7 @@
- 	@for i in `find $(distdir)/ports/winnt -type f -name '*.ds*' -print`; \
- 	   do chmod u+w $$i ; unix2dos $$i $$i; done
- 
--.warning:
-+.gcc-warning:
- 	@echo "Compiling with GCC now generates lots of new warnings."
- 	@echo " "
- 	@echo "Don't be concerned. They're just warnings."
-@@ -682,7 +682,7 @@
- 	@echo "Feel free to send patches that fix these warnings, though."
- 	@echo " "
- 	@sleep 1
--	@touch .warning
-+	@touch .gcc-warning
- 
- .buildcvo:
- 	echo "$(CVO)" > .buildcvo
diff --git a/net/ntp-stable/files/patch-aa b/net/ntp-stable/files/patch-aa
deleted file mode 100644
index df54ce2e249b..000000000000
--- a/net/ntp-stable/files/patch-aa
+++ /dev/null
@@ -1,39 +0,0 @@
---- ntpd/ntp_control.c.orig	Mon Apr  9 13:19:56 2001
-+++ ntpd/ntp_control.c	Wed Apr 11 20:53:28 2001
-@@ -1823,7 +1823,7 @@
- 	 * Delete leading commas and white space
- 	 */
- 	while (reqpt < reqend && (*reqpt == ',' ||
--	    isspace((int)*reqpt)))
-+	    isspace((unsigned char)*reqpt)))
- 		reqpt++;
- 	if (reqpt >= reqend)
- 		return (0);
-@@ -1846,7 +1846,7 @@
- 				tp++;
- 			}
- 			if ((*tp == '\0') || (*tp == '=')) {
--				while (cp < reqend && isspace((int)*cp))
-+				while (cp < reqend && isspace((unsigned char)*cp))
- 					cp++;
- 				if (cp == reqend || *cp == ',') {
- 					buf[0] = '\0';
-@@ -1859,7 +1859,7 @@
- 				if (*cp == '=') {
- 					cp++;
- 					tp = buf;
--					while (cp < reqend && isspace((int)*cp))
-+					while (cp < reqend && isspace((unsigned char)*cp))
- 						cp++;
- 					while (cp < reqend && *cp != ',') {
- 						*tp++ = *cp++;
-@@ -1904,8 +1904,8 @@
- 						cp++;
- 					*tp-- = '\0';
- 					while (tp >= buf) {
--						if (!isspace((int)(*tp)))
-+						if (!isspace((unsigned char)(*tp)))
- 							break;
- 						*tp-- = '\0';
- 					}
- 					reqpt = cp;
diff --git a/net/ntp-stable/files/patch-configure b/net/ntp-stable/files/patch-configure
deleted file mode 100644
index 0f7bcb551501..000000000000
--- a/net/ntp-stable/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure	Tue Dec 18 19:27:28 2001
-+++ configure	Sat Dec 22 00:41:29 2001
-@@ -1276,6 +1276,11 @@
-  mips-sgi-irix*)
-     ans=yes
-     ;;
-+ i?86-*-freebsd[[123]].*)
-+    ;;
-+ i?86-*-freebsd*)
-+    ans=yes
-+    ;;
- esac
- ac_cv_var_no_parenb_ignpar=$ans])
- case "$ac_cv_var_no_parenb_ignpar" in
diff --git a/net/ntp-stable/files/patch-ntpdc::ntpdc.c b/net/ntp-stable/files/patch-ntpdc::ntpdc.c
deleted file mode 100644
index bb13b576a464..000000000000
--- a/net/ntp-stable/files/patch-ntpdc::ntpdc.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ntpdc/ntpdc.c.orig	Sat Oct 11 00:52:22 2003
-+++ ntpdc/ntpdc.c	Sun Jan 25 13:29:58 2004
-@@ -449,7 +449,11 @@
- 	hints.ai_flags = AI_NUMERICHOST;
- 
- 	a_info = getaddrinfo(hname, service, &hints, &ai);
-+#ifdef EAI_NODATA
- 	if (a_info == EAI_NONAME || a_info == EAI_NODATA) {
-+#else
-+	if (a_info == EAI_NONAME) {
-+#endif
- 		hints.ai_flags = AI_CANONNAME;
- #ifdef AI_ADDRCONFIG
- 		hints.ai_flags |= AI_ADDRCONFIG;
diff --git a/net/ntp-stable/files/patch-ntpq::ntpq.c b/net/ntp-stable/files/patch-ntpq::ntpq.c
deleted file mode 100644
index 0a221dd0742b..000000000000
--- a/net/ntp-stable/files/patch-ntpq::ntpq.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ntpq/ntpq.c.orig	Thu Oct  9 02:27:05 2003
-+++ ntpq/ntpq.c	Sun Jan 25 13:49:33 2004
-@@ -630,7 +630,11 @@
- 	hints.ai_flags = AI_NUMERICHOST;
- 
- 	a_info = getaddrinfo(hname, service, &hints, &ai);
-+#ifdef EAI_NODATA
- 	if (a_info == EAI_NONAME || a_info == EAI_NODATA) {
-+#else
-+	if (a_info == EAI_NONAME) {
-+#endif
- 		hints.ai_flags = AI_CANONNAME;
- #ifdef AI_ADDRCONFIG
- 		hints.ai_flags |= AI_ADDRCONFIG;
diff --git a/net/ntp-stable/pkg-descr b/net/ntp-stable/pkg-descr
deleted file mode 100644
index 8610484769d3..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.ntp.org/
diff --git a/net/ntp-stable/pkg-plist b/net/ntp-stable/pkg-plist
deleted file mode 100644
index b15360f5a9a8..000000000000
--- a/net/ntp-stable/pkg-plist
+++ /dev/null
@@ -1,187 +0,0 @@
-bin/ntp-keygen
-bin/ntpd
-bin/ntpdate
-bin/ntpdc
-bin/ntpq
-bin/ntptime
-bin/ntptrace
-bin/ntp-wait
-bin/tickadj
-%%PORTDOCS%%share/doc/ntp/accopt.html
-%%PORTDOCS%%share/doc/ntp/assoc.html
-%%PORTDOCS%%share/doc/ntp/audio.html
-%%PORTDOCS%%share/doc/ntp/authopt.html
-%%PORTDOCS%%share/doc/ntp/build.html
-%%PORTDOCS%%share/doc/ntp/clockopt.html
-%%PORTDOCS%%share/doc/ntp/config.html
-%%PORTDOCS%%share/doc/ntp/confopt.html
-%%PORTDOCS%%share/doc/ntp/copyright.html
-%%PORTDOCS%%share/doc/ntp/debug.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver1.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver10.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver11.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver12.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver16.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver18.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver19.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver2.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver20.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver22.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver23.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver24.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver26.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver27.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver28.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver29.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver3.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver30.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver32.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver33.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver34.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver35.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver36.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver37.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver38.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver39.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver4.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver40.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver42.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver43.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver44.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver5.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver6.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver7.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver8.html
-%%PORTDOCS%%share/doc/ntp/drivers/driver9.html
-%%PORTDOCS%%share/doc/ntp/drivers/icons/home.gif
-%%PORTDOCS%%share/doc/ntp/drivers/icons/mail2.gif
-%%PORTDOCS%%share/doc/ntp/drivers/oncore-shmem.html
-%%PORTDOCS%%share/doc/ntp/extern.html
-%%PORTDOCS%%share/doc/ntp/hints.html
-%%PORTDOCS%%share/doc/ntp/hints/a-ux
-%%PORTDOCS%%share/doc/ntp/hints/aix
-%%PORTDOCS%%share/doc/ntp/hints/bsdi
-%%PORTDOCS%%share/doc/ntp/hints/changes
-%%PORTDOCS%%share/doc/ntp/hints/decosf1
-%%PORTDOCS%%share/doc/ntp/hints/decosf2
-%%PORTDOCS%%share/doc/ntp/hints/freebsd
-%%PORTDOCS%%share/doc/ntp/hints/hpux
-%%PORTDOCS%%share/doc/ntp/hints/linux
-%%PORTDOCS%%share/doc/ntp/hints/mpeix
-%%PORTDOCS%%share/doc/ntp/hints/netbsd
-%%PORTDOCS%%share/doc/ntp/hints/notes-xntp-v3
-%%PORTDOCS%%share/doc/ntp/hints/parse
-%%PORTDOCS%%share/doc/ntp/hints/refclocks
-%%PORTDOCS%%share/doc/ntp/hints/rs6000
-%%PORTDOCS%%share/doc/ntp/hints/sco.html
-%%PORTDOCS%%share/doc/ntp/hints/sgi
-%%PORTDOCS%%share/doc/ntp/hints/solaris-dosynctodr.html
-%%PORTDOCS%%share/doc/ntp/hints/solaris.html
-%%PORTDOCS%%share/doc/ntp/hints/solaris.xtra.4023118
-%%PORTDOCS%%share/doc/ntp/hints/solaris.xtra.4095849
-%%PORTDOCS%%share/doc/ntp/hints/solaris.xtra.S99ntpd
-%%PORTDOCS%%share/doc/ntp/hints/solaris.xtra.patchfreq
-%%PORTDOCS%%share/doc/ntp/hints/sun4
-%%PORTDOCS%%share/doc/ntp/hints/svr4-dell
-%%PORTDOCS%%share/doc/ntp/hints/svr4_package
-%%PORTDOCS%%share/doc/ntp/hints/todo
-%%PORTDOCS%%share/doc/ntp/hints/vxworks.html
-%%PORTDOCS%%share/doc/ntp/hints/winnt.html
-%%PORTDOCS%%share/doc/ntp/howto.html
-%%PORTDOCS%%share/doc/ntp/icons/home.gif
-%%PORTDOCS%%share/doc/ntp/icons/mail2.gif
-%%PORTDOCS%%share/doc/ntp/index.html
-%%PORTDOCS%%share/doc/ntp/kern.html
-%%PORTDOCS%%share/doc/ntp/keygen.html
-%%PORTDOCS%%share/doc/ntp/ldisc.html
-%%PORTDOCS%%share/doc/ntp/manyopt.html
-%%PORTDOCS%%share/doc/ntp/measure.html
-%%PORTDOCS%%share/doc/ntp/miscopt.html
-%%PORTDOCS%%share/doc/ntp/monopt.html
-%%PORTDOCS%%share/doc/ntp/msyslog.html
-%%PORTDOCS%%share/doc/ntp/mx4200data.html
-%%PORTDOCS%%share/doc/ntp/notes.html
-%%PORTDOCS%%share/doc/ntp/ntpd.html
-%%PORTDOCS%%share/doc/ntp/ntpdate.html
-%%PORTDOCS%%share/doc/ntp/ntpdc.html
-%%PORTDOCS%%share/doc/ntp/ntpdsim.html
-%%PORTDOCS%%share/doc/ntp/ntpq.html
-%%PORTDOCS%%share/doc/ntp/ntptime.html
-%%PORTDOCS%%share/doc/ntp/ntptrace.html
-%%PORTDOCS%%share/doc/ntp/parsedata.html
-%%PORTDOCS%%share/doc/ntp/parsenew.html
-%%PORTDOCS%%share/doc/ntp/patches.html
-%%PORTDOCS%%share/doc/ntp/pic/9400n.jpg
-%%PORTDOCS%%share/doc/ntp/pic/alice11.gif
-%%PORTDOCS%%share/doc/ntp/pic/alice13.gif
-%%PORTDOCS%%share/doc/ntp/pic/alice23.gif
-%%PORTDOCS%%share/doc/ntp/pic/alice31.gif
-%%PORTDOCS%%share/doc/ntp/pic/alice32.gif
-%%PORTDOCS%%share/doc/ntp/pic/alice35.gif
-%%PORTDOCS%%share/doc/ntp/pic/alice38.gif
-%%PORTDOCS%%share/doc/ntp/pic/alice44.gif
-%%PORTDOCS%%share/doc/ntp/pic/alice47.gif
-%%PORTDOCS%%share/doc/ntp/pic/alice51.gif
-%%PORTDOCS%%share/doc/ntp/pic/alice61.gif
-%%PORTDOCS%%share/doc/ntp/pic/barnstable.gif
-%%PORTDOCS%%share/doc/ntp/pic/beaver.gif
-%%PORTDOCS%%share/doc/ntp/pic/boom3.gif
-%%PORTDOCS%%share/doc/ntp/pic/boom3a.gif
-%%PORTDOCS%%share/doc/ntp/pic/bustardfly.gif
-%%PORTDOCS%%share/doc/ntp/pic/c51.jpg
-%%PORTDOCS%%share/doc/ntp/pic/dogsnake.gif
-%%PORTDOCS%%share/doc/ntp/pic/driver29.gif
-%%PORTDOCS%%share/doc/ntp/pic/driver43_1.gif
-%%PORTDOCS%%share/doc/ntp/pic/driver43_2.jpg
-%%PORTDOCS%%share/doc/ntp/pic/fg6021.gif
-%%PORTDOCS%%share/doc/ntp/pic/fg6039.jpg
-%%PORTDOCS%%share/doc/ntp/pic/gadget.jpg
-%%PORTDOCS%%share/doc/ntp/pic/gps167.jpg
-%%PORTDOCS%%share/doc/ntp/pic/hornraba.gif
-%%PORTDOCS%%share/doc/ntp/pic/igclock.gif
-%%PORTDOCS%%share/doc/ntp/pic/neoclock4x.gif
-%%PORTDOCS%%share/doc/ntp/pic/oncore_evalbig.gif
-%%PORTDOCS%%share/doc/ntp/pic/oncore_remoteant.jpg
-%%PORTDOCS%%share/doc/ntp/pic/oncore_utplusbig.gif
-%%PORTDOCS%%share/doc/ntp/pic/oz2.gif
-%%PORTDOCS%%share/doc/ntp/pic/panda.gif
-%%PORTDOCS%%share/doc/ntp/pic/pd_om006.gif
-%%PORTDOCS%%share/doc/ntp/pic/pd_om011.gif
-%%PORTDOCS%%share/doc/ntp/pic/pogo.gif
-%%PORTDOCS%%share/doc/ntp/pic/pogo1a.gif
-%%PORTDOCS%%share/doc/ntp/pic/pogo3a.gif
-%%PORTDOCS%%share/doc/ntp/pic/pogo4.gif
-%%PORTDOCS%%share/doc/ntp/pic/pogo5.gif
-%%PORTDOCS%%share/doc/ntp/pic/pogo6.gif
-%%PORTDOCS%%share/doc/ntp/pic/pogo8.gif
-%%PORTDOCS%%share/doc/ntp/pic/pzf509.jpg
-%%PORTDOCS%%share/doc/ntp/pic/rabbit.gif
-%%PORTDOCS%%share/doc/ntp/pic/radio2.jpg
-%%PORTDOCS%%share/doc/ntp/pic/sheepb.jpg
-%%PORTDOCS%%share/doc/ntp/pic/stack1a.jpg
-%%PORTDOCS%%share/doc/ntp/pic/tonea.gif
-%%PORTDOCS%%share/doc/ntp/pic/wingdorothy.gif
-%%PORTDOCS%%share/doc/ntp/porting.html
-%%PORTDOCS%%share/doc/ntp/pps.html
-%%PORTDOCS%%share/doc/ntp/prefer.html
-%%PORTDOCS%%share/doc/ntp/quick.html
-%%PORTDOCS%%share/doc/ntp/rdebug.html
-%%PORTDOCS%%share/doc/ntp/refclock.html
-%%PORTDOCS%%share/doc/ntp/release.html
-%%PORTDOCS%%share/doc/ntp/scripts/footer.txt
-%%PORTDOCS%%share/doc/ntp/scripts/links10.txt
-%%PORTDOCS%%share/doc/ntp/scripts/links11.txt
-%%PORTDOCS%%share/doc/ntp/scripts/links12.txt
-%%PORTDOCS%%share/doc/ntp/scripts/links7.txt
-%%PORTDOCS%%share/doc/ntp/scripts/links8.txt
-%%PORTDOCS%%share/doc/ntp/scripts/links9.txt
-%%PORTDOCS%%share/doc/ntp/scripts/style.css
-%%PORTDOCS%%share/doc/ntp/sntp.html
-%%PORTDOCS%%share/doc/ntp/tickadj.html
-%%PORTDOCS%%@dirrm share/doc/ntp/scripts
-%%PORTDOCS%%@dirrm share/doc/ntp/pic
-%%PORTDOCS%%@dirrm share/doc/ntp/icons
-%%PORTDOCS%%@dirrm share/doc/ntp/hints
-%%PORTDOCS%%@dirrm share/doc/ntp/drivers/icons
-%%PORTDOCS%%@dirrm share/doc/ntp/drivers
-%%PORTDOCS%%@dirrm share/doc/ntp
diff --git a/net/opal/Makefile b/net/opal/Makefile
deleted file mode 100644
index d5ce2ec75d4d..000000000000
--- a/net/opal/Makefile
+++ /dev/null
@@ -1,70 +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.12.0
-PORTREVISION=	3
-CATEGORIES=	net
-MASTER_SITES=	http://www.openh323.org/bin/ \
-		http://www.de.openh323.org/bin/ \
-		http://www.gnomemeeting.org/downloads/0.98.0/sources/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
-
-MAINTAINER=	roger@FreeBSD.org
-COMMENT=	A H323 Video Conferencing library
-
-FORBIDDEN=	http://people.freebsd.org/~eik/portaudit/27c331d5-64c7-11d8-80e3-0020ed76ef5a.html
-
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build
-
-LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
-
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-# Check for telephony.h in the two places the source is hard coded to check
-# /usr/include/sys and /usr/local/include/sys
-# If it is not present, extract it from the comms/ixj port
-.if !exists(/usr/include/sys/telephony.h)
-.if !exists(/usr/local/include/sys/telephony.h)
-PATCH_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/comms/ixj:patch
-.endif
-.endif
-.endif
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-PLIST_FILES=	bin/simph323
-USE_BISON=	yes
-
-USE_GMAKE=	yes
-USE_OPENLDAP=	yes
-USE_AUTOCONF_VER=	253
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIR}/openh323
-ALL_TARGET=	optnoshared
-MAKE_ENV=	PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIR}/openh323
-THE_MACHTYPE=	${ARCH:S/i386/x86/}
-MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
-
-post-patch:
-.if ${OSVERSION} < 500000
-.if !exists(/usr/include/sys/telephony.h)
-.if !exists(/usr/local/include/sys/telephony.h)
-	# Copy ixj driver include files into OpenH323 include directory
-	${MKDIR} ${WRKDIR}/openh323/include/sys
-	${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/telephony.h ${WRKDIR}/openh323/include/sys
-	${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/ixjuser.h ${WRKDIR}/openh323/include/sys
-.endif
-.endif
-.endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin
-
-.include <bsd.port.post.mk>
diff --git a/net/opal/distinfo b/net/opal/distinfo
deleted file mode 100644
index bc1860481dea..000000000000
--- a/net/opal/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (openh323_1.12.0.tar.gz) = f7932f0a17d6afafc7332036a4b5d392
-SIZE (openh323_1.12.0.tar.gz) = 2325128
diff --git a/net/opal/files/patch-configurein b/net/opal/files/patch-configurein
deleted file mode 100644
index 3d6ff53673a9..000000000000
--- a/net/opal/files/patch-configurein
+++ /dev/null
@@ -1,31 +0,0 @@
-*** configure.in.orig	Thu May 22 13:25:00 2003
---- configure.in	Sat Aug 23 07:52:44 2003
-*************** fi
-*** 73,85 ****
-  
-  dnl ########################################################################
-  dnl get pwlib directory
-! if test "${PWLIBDIR:-unset}" == "unset" ; then
-    PWLIBDIR=`ptlib-config --prefix`
-  fi
-! if test "x$PWLIBDIR" == "x/usr" -o "x$PWLIBDIR" == "x/usr/"; then
-    PWLIBDIR="/usr/share/pwlib/"
-  fi
-! if test "xPWLIBDIR" == "x/usr/local" -o "x$PWLIBDIR" == "x/usr/"; then
-    PWLIBDIR="/usr/local/share/pwlib/"
-  fi
-  echo "PWLib prefix set to.... $PWLIBDIR"
---- 73,85 ----
-  
-  dnl ########################################################################
-  dnl get pwlib directory
-! if test "${PWLIBDIR:-unset}" = "unset" ; then
-    PWLIBDIR=`ptlib-config --prefix`
-  fi
-! if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then
-    PWLIBDIR="/usr/share/pwlib/"
-  fi
-! if test "xPWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
-    PWLIBDIR="/usr/local/share/pwlib/"
-  fi
-  echo "PWLib prefix set to.... $PWLIBDIR"
diff --git a/net/opal/files/patch-ixjlid b/net/opal/files/patch-ixjlid
deleted file mode 100644
index faec5f30ea6b..000000000000
--- a/net/opal/files/patch-ixjlid
+++ /dev/null
@@ -1,21 +0,0 @@
-*** include/ixjlid.h.orig	Tue Sep  2 17:32:20 2003
---- include/ixjlid.h	Tue Sep  2 17:32:37 2003
-***************
-*** 253,260 ****
-  #include <linux/ixjuser.h>
-  #endif
-  #ifdef P_FREEBSD
-! #include <sys/telephony.h>
-! #include <sys/ixjuser.h>
-  #endif
-  #endif
-  
---- 253,260 ----
-  #include <linux/ixjuser.h>
-  #endif
-  #ifdef P_FREEBSD
-! #include "sys/telephony.h"
-! #include "sys/ixjuser.h"
-  #endif
-  #endif
-  
diff --git a/net/opal/files/patch-openh323uin b/net/opal/files/patch-openh323uin
deleted file mode 100644
index 4613a12f810e..000000000000
--- a/net/opal/files/patch-openh323uin
+++ /dev/null
@@ -1,53 +0,0 @@
-*** openh323u.mak.in.orig	Wed May 14 20:52:44 2003
---- openh323u.mak.in	Sun Aug 31 21:26:51 2003
-*************** LIBDIRS += $(OPENH323DIR)
-*** 142,152 ****
-  
-  
-  OH323_SRCDIR = $(OPENH323DIR)/src
-! ifdef PREFIX
-! OH323_INCDIR = $(PREFIX)/include/openh323
-! else
-  OH323_INCDIR = $(OPENH323DIR)/include
-! endif
-  OH323_LIBDIR = $(OPENH323DIR)/lib
-  
-  
---- 142,152 ----
-  
-  
-  OH323_SRCDIR = $(OPENH323DIR)/src
-! #ifdef PREFIX
-! #OH323_INCDIR = $(PREFIX)/include/openh323
-! #else
-  OH323_INCDIR = $(OPENH323DIR)/include
-! #endif
-  OH323_LIBDIR = $(OPENH323DIR)/lib
-  
-  
-*************** ifdef	OH323_SUPPRESS_H235
-*** 184,189 ****
---- 184,190 ----
-  STDCCFLAGS  += -DOH323_SUPPRESS_H235
-  endif
-  
-+ # Check for the ixj/telephony header files on the system.
-  ifneq (,$(wildcard $(SYSINCDIR)/linux/telephony.h))
-  HAS_IXJ	    = 1
-  STDCCFLAGS += -DHAS_IXJ
-*************** endif
-*** 197,202 ****
---- 198,210 ----
-  ifneq (,$(wildcard /usr/local/include/sys/telephony.h))
-  HAS_IXJ	    = 1
-  STDCCFLAGS += -DHAS_IXJ -I/usr/local/include
-+ endif
-+ 
-+ # In the FreeBSD port, we make a local copy of the ixj header files from
-+ # the ixj driver in openh323/include/sys
-+ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h))
-+ HAS_IXJ	    = 1
-+ STDCCFLAGS += -DHAS_IXJ
-  endif
-  
-  #Check if we have an OSS soundcard.h
diff --git a/net/opal/pkg-descr b/net/opal/pkg-descr
deleted file mode 100644
index 5ea7add9f222..000000000000
--- a/net/opal/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-OpenH323 is a multi-platform H323 Video Conferencing library.
-
-This is used to make H323 Video Conferencing applications
-like GnomeMeeting and ohphone. (both in the FreeBSD ports tree)
-
-The library includes a sample program called simph323.
-
-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/Makefile b/net/opal3/Makefile
deleted file mode 100644
index d5ce2ec75d4d..000000000000
--- a/net/opal3/Makefile
+++ /dev/null
@@ -1,70 +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.12.0
-PORTREVISION=	3
-CATEGORIES=	net
-MASTER_SITES=	http://www.openh323.org/bin/ \
-		http://www.de.openh323.org/bin/ \
-		http://www.gnomemeeting.org/downloads/0.98.0/sources/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
-
-MAINTAINER=	roger@FreeBSD.org
-COMMENT=	A H323 Video Conferencing library
-
-FORBIDDEN=	http://people.freebsd.org/~eik/portaudit/27c331d5-64c7-11d8-80e3-0020ed76ef5a.html
-
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build
-
-LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
-
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-# Check for telephony.h in the two places the source is hard coded to check
-# /usr/include/sys and /usr/local/include/sys
-# If it is not present, extract it from the comms/ixj port
-.if !exists(/usr/include/sys/telephony.h)
-.if !exists(/usr/local/include/sys/telephony.h)
-PATCH_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/comms/ixj:patch
-.endif
-.endif
-.endif
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-PLIST_FILES=	bin/simph323
-USE_BISON=	yes
-
-USE_GMAKE=	yes
-USE_OPENLDAP=	yes
-USE_AUTOCONF_VER=	253
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIR}/openh323
-ALL_TARGET=	optnoshared
-MAKE_ENV=	PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIR}/openh323
-THE_MACHTYPE=	${ARCH:S/i386/x86/}
-MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
-
-post-patch:
-.if ${OSVERSION} < 500000
-.if !exists(/usr/include/sys/telephony.h)
-.if !exists(/usr/local/include/sys/telephony.h)
-	# Copy ixj driver include files into OpenH323 include directory
-	${MKDIR} ${WRKDIR}/openh323/include/sys
-	${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/telephony.h ${WRKDIR}/openh323/include/sys
-	${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/ixjuser.h ${WRKDIR}/openh323/include/sys
-.endif
-.endif
-.endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin
-
-.include <bsd.port.post.mk>
diff --git a/net/opal3/distinfo b/net/opal3/distinfo
deleted file mode 100644
index bc1860481dea..000000000000
--- a/net/opal3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (openh323_1.12.0.tar.gz) = f7932f0a17d6afafc7332036a4b5d392
-SIZE (openh323_1.12.0.tar.gz) = 2325128
diff --git a/net/opal3/files/patch-configurein b/net/opal3/files/patch-configurein
deleted file mode 100644
index 3d6ff53673a9..000000000000
--- a/net/opal3/files/patch-configurein
+++ /dev/null
@@ -1,31 +0,0 @@
-*** configure.in.orig	Thu May 22 13:25:00 2003
---- configure.in	Sat Aug 23 07:52:44 2003
-*************** fi
-*** 73,85 ****
-  
-  dnl ########################################################################
-  dnl get pwlib directory
-! if test "${PWLIBDIR:-unset}" == "unset" ; then
-    PWLIBDIR=`ptlib-config --prefix`
-  fi
-! if test "x$PWLIBDIR" == "x/usr" -o "x$PWLIBDIR" == "x/usr/"; then
-    PWLIBDIR="/usr/share/pwlib/"
-  fi
-! if test "xPWLIBDIR" == "x/usr/local" -o "x$PWLIBDIR" == "x/usr/"; then
-    PWLIBDIR="/usr/local/share/pwlib/"
-  fi
-  echo "PWLib prefix set to.... $PWLIBDIR"
---- 73,85 ----
-  
-  dnl ########################################################################
-  dnl get pwlib directory
-! if test "${PWLIBDIR:-unset}" = "unset" ; then
-    PWLIBDIR=`ptlib-config --prefix`
-  fi
-! if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then
-    PWLIBDIR="/usr/share/pwlib/"
-  fi
-! if test "xPWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
-    PWLIBDIR="/usr/local/share/pwlib/"
-  fi
-  echo "PWLib prefix set to.... $PWLIBDIR"
diff --git a/net/opal3/files/patch-ixjlid b/net/opal3/files/patch-ixjlid
deleted file mode 100644
index faec5f30ea6b..000000000000
--- a/net/opal3/files/patch-ixjlid
+++ /dev/null
@@ -1,21 +0,0 @@
-*** include/ixjlid.h.orig	Tue Sep  2 17:32:20 2003
---- include/ixjlid.h	Tue Sep  2 17:32:37 2003
-***************
-*** 253,260 ****
-  #include <linux/ixjuser.h>
-  #endif
-  #ifdef P_FREEBSD
-! #include <sys/telephony.h>
-! #include <sys/ixjuser.h>
-  #endif
-  #endif
-  
---- 253,260 ----
-  #include <linux/ixjuser.h>
-  #endif
-  #ifdef P_FREEBSD
-! #include "sys/telephony.h"
-! #include "sys/ixjuser.h"
-  #endif
-  #endif
-  
diff --git a/net/opal3/files/patch-openh323uin b/net/opal3/files/patch-openh323uin
deleted file mode 100644
index 4613a12f810e..000000000000
--- a/net/opal3/files/patch-openh323uin
+++ /dev/null
@@ -1,53 +0,0 @@
-*** openh323u.mak.in.orig	Wed May 14 20:52:44 2003
---- openh323u.mak.in	Sun Aug 31 21:26:51 2003
-*************** LIBDIRS += $(OPENH323DIR)
-*** 142,152 ****
-  
-  
-  OH323_SRCDIR = $(OPENH323DIR)/src
-! ifdef PREFIX
-! OH323_INCDIR = $(PREFIX)/include/openh323
-! else
-  OH323_INCDIR = $(OPENH323DIR)/include
-! endif
-  OH323_LIBDIR = $(OPENH323DIR)/lib
-  
-  
---- 142,152 ----
-  
-  
-  OH323_SRCDIR = $(OPENH323DIR)/src
-! #ifdef PREFIX
-! #OH323_INCDIR = $(PREFIX)/include/openh323
-! #else
-  OH323_INCDIR = $(OPENH323DIR)/include
-! #endif
-  OH323_LIBDIR = $(OPENH323DIR)/lib
-  
-  
-*************** ifdef	OH323_SUPPRESS_H235
-*** 184,189 ****
---- 184,190 ----
-  STDCCFLAGS  += -DOH323_SUPPRESS_H235
-  endif
-  
-+ # Check for the ixj/telephony header files on the system.
-  ifneq (,$(wildcard $(SYSINCDIR)/linux/telephony.h))
-  HAS_IXJ	    = 1
-  STDCCFLAGS += -DHAS_IXJ
-*************** endif
-*** 197,202 ****
---- 198,210 ----
-  ifneq (,$(wildcard /usr/local/include/sys/telephony.h))
-  HAS_IXJ	    = 1
-  STDCCFLAGS += -DHAS_IXJ -I/usr/local/include
-+ endif
-+ 
-+ # In the FreeBSD port, we make a local copy of the ixj header files from
-+ # the ixj driver in openh323/include/sys
-+ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h))
-+ HAS_IXJ	    = 1
-+ STDCCFLAGS += -DHAS_IXJ
-  endif
-  
-  #Check if we have an OSS soundcard.h
diff --git a/net/opal3/pkg-descr b/net/opal3/pkg-descr
deleted file mode 100644
index 5ea7add9f222..000000000000
--- a/net/opal3/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-OpenH323 is a multi-platform H323 Video Conferencing library.
-
-This is used to make H323 Video Conferencing applications
-like GnomeMeeting and ohphone. (both in the FreeBSD ports tree)
-
-The library includes a sample program called simph323.
-
-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/Makefile b/net/openh323-112/Makefile
deleted file mode 100644
index d5ce2ec75d4d..000000000000
--- a/net/openh323-112/Makefile
+++ /dev/null
@@ -1,70 +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.12.0
-PORTREVISION=	3
-CATEGORIES=	net
-MASTER_SITES=	http://www.openh323.org/bin/ \
-		http://www.de.openh323.org/bin/ \
-		http://www.gnomemeeting.org/downloads/0.98.0/sources/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
-
-MAINTAINER=	roger@FreeBSD.org
-COMMENT=	A H323 Video Conferencing library
-
-FORBIDDEN=	http://people.freebsd.org/~eik/portaudit/27c331d5-64c7-11d8-80e3-0020ed76ef5a.html
-
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build
-
-LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
-
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-# Check for telephony.h in the two places the source is hard coded to check
-# /usr/include/sys and /usr/local/include/sys
-# If it is not present, extract it from the comms/ixj port
-.if !exists(/usr/include/sys/telephony.h)
-.if !exists(/usr/local/include/sys/telephony.h)
-PATCH_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/comms/ixj:patch
-.endif
-.endif
-.endif
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-PLIST_FILES=	bin/simph323
-USE_BISON=	yes
-
-USE_GMAKE=	yes
-USE_OPENLDAP=	yes
-USE_AUTOCONF_VER=	253
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIR}/openh323
-ALL_TARGET=	optnoshared
-MAKE_ENV=	PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIR}/openh323
-THE_MACHTYPE=	${ARCH:S/i386/x86/}
-MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
-
-post-patch:
-.if ${OSVERSION} < 500000
-.if !exists(/usr/include/sys/telephony.h)
-.if !exists(/usr/local/include/sys/telephony.h)
-	# Copy ixj driver include files into OpenH323 include directory
-	${MKDIR} ${WRKDIR}/openh323/include/sys
-	${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/telephony.h ${WRKDIR}/openh323/include/sys
-	${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/ixjuser.h ${WRKDIR}/openh323/include/sys
-.endif
-.endif
-.endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin
-
-.include <bsd.port.post.mk>
diff --git a/net/openh323-112/distinfo b/net/openh323-112/distinfo
deleted file mode 100644
index bc1860481dea..000000000000
--- a/net/openh323-112/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (openh323_1.12.0.tar.gz) = f7932f0a17d6afafc7332036a4b5d392
-SIZE (openh323_1.12.0.tar.gz) = 2325128
diff --git a/net/openh323-112/files/patch-configurein b/net/openh323-112/files/patch-configurein
deleted file mode 100644
index 3d6ff53673a9..000000000000
--- a/net/openh323-112/files/patch-configurein
+++ /dev/null
@@ -1,31 +0,0 @@
-*** configure.in.orig	Thu May 22 13:25:00 2003
---- configure.in	Sat Aug 23 07:52:44 2003
-*************** fi
-*** 73,85 ****
-  
-  dnl ########################################################################
-  dnl get pwlib directory
-! if test "${PWLIBDIR:-unset}" == "unset" ; then
-    PWLIBDIR=`ptlib-config --prefix`
-  fi
-! if test "x$PWLIBDIR" == "x/usr" -o "x$PWLIBDIR" == "x/usr/"; then
-    PWLIBDIR="/usr/share/pwlib/"
-  fi
-! if test "xPWLIBDIR" == "x/usr/local" -o "x$PWLIBDIR" == "x/usr/"; then
-    PWLIBDIR="/usr/local/share/pwlib/"
-  fi
-  echo "PWLib prefix set to.... $PWLIBDIR"
---- 73,85 ----
-  
-  dnl ########################################################################
-  dnl get pwlib directory
-! if test "${PWLIBDIR:-unset}" = "unset" ; then
-    PWLIBDIR=`ptlib-config --prefix`
-  fi
-! if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then
-    PWLIBDIR="/usr/share/pwlib/"
-  fi
-! if test "xPWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
-    PWLIBDIR="/usr/local/share/pwlib/"
-  fi
-  echo "PWLib prefix set to.... $PWLIBDIR"
diff --git a/net/openh323-112/files/patch-ixjlid b/net/openh323-112/files/patch-ixjlid
deleted file mode 100644
index faec5f30ea6b..000000000000
--- a/net/openh323-112/files/patch-ixjlid
+++ /dev/null
@@ -1,21 +0,0 @@
-*** include/ixjlid.h.orig	Tue Sep  2 17:32:20 2003
---- include/ixjlid.h	Tue Sep  2 17:32:37 2003
-***************
-*** 253,260 ****
-  #include <linux/ixjuser.h>
-  #endif
-  #ifdef P_FREEBSD
-! #include <sys/telephony.h>
-! #include <sys/ixjuser.h>
-  #endif
-  #endif
-  
---- 253,260 ----
-  #include <linux/ixjuser.h>
-  #endif
-  #ifdef P_FREEBSD
-! #include "sys/telephony.h"
-! #include "sys/ixjuser.h"
-  #endif
-  #endif
-  
diff --git a/net/openh323-112/files/patch-openh323uin b/net/openh323-112/files/patch-openh323uin
deleted file mode 100644
index 4613a12f810e..000000000000
--- a/net/openh323-112/files/patch-openh323uin
+++ /dev/null
@@ -1,53 +0,0 @@
-*** openh323u.mak.in.orig	Wed May 14 20:52:44 2003
---- openh323u.mak.in	Sun Aug 31 21:26:51 2003
-*************** LIBDIRS += $(OPENH323DIR)
-*** 142,152 ****
-  
-  
-  OH323_SRCDIR = $(OPENH323DIR)/src
-! ifdef PREFIX
-! OH323_INCDIR = $(PREFIX)/include/openh323
-! else
-  OH323_INCDIR = $(OPENH323DIR)/include
-! endif
-  OH323_LIBDIR = $(OPENH323DIR)/lib
-  
-  
---- 142,152 ----
-  
-  
-  OH323_SRCDIR = $(OPENH323DIR)/src
-! #ifdef PREFIX
-! #OH323_INCDIR = $(PREFIX)/include/openh323
-! #else
-  OH323_INCDIR = $(OPENH323DIR)/include
-! #endif
-  OH323_LIBDIR = $(OPENH323DIR)/lib
-  
-  
-*************** ifdef	OH323_SUPPRESS_H235
-*** 184,189 ****
---- 184,190 ----
-  STDCCFLAGS  += -DOH323_SUPPRESS_H235
-  endif
-  
-+ # Check for the ixj/telephony header files on the system.
-  ifneq (,$(wildcard $(SYSINCDIR)/linux/telephony.h))
-  HAS_IXJ	    = 1
-  STDCCFLAGS += -DHAS_IXJ
-*************** endif
-*** 197,202 ****
---- 198,210 ----
-  ifneq (,$(wildcard /usr/local/include/sys/telephony.h))
-  HAS_IXJ	    = 1
-  STDCCFLAGS += -DHAS_IXJ -I/usr/local/include
-+ endif
-+ 
-+ # In the FreeBSD port, we make a local copy of the ixj header files from
-+ # the ixj driver in openh323/include/sys
-+ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h))
-+ HAS_IXJ	    = 1
-+ STDCCFLAGS += -DHAS_IXJ
-  endif
-  
-  #Check if we have an OSS soundcard.h
diff --git a/net/openh323-112/pkg-descr b/net/openh323-112/pkg-descr
deleted file mode 100644
index 5ea7add9f222..000000000000
--- a/net/openh323-112/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-OpenH323 is a multi-platform H323 Video Conferencing library.
-
-This is used to make H323 Video Conferencing applications
-like GnomeMeeting and ohphone. (both in the FreeBSD ports tree)
-
-The library includes a sample program called simph323.
-
-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/openldap23-client/Makefile b/net/openldap23-client/Makefile
deleted file mode 100644
index 172fa7d40eec..000000000000
--- a/net/openldap23-client/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# New ports collection makefile for:	openldap22-client
-# Date created:				10 Jul 2003
-# Whom:					Oliver Eikemeier <eikemeier@fillmore-labs.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=		openldap
-
-COMMENT=		Open source LDAP client implementation
-
-CLIENT_ONLY=		yes
-
-MASTERDIR=		${.CURDIR}/../openldap22-server
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
deleted file mode 100644
index 29fc20f58db3..000000000000
--- a/net/openldap23-server/Makefile
+++ /dev/null
@@ -1,341 +0,0 @@
-# New ports collection makefile for:	openldap22-server
-# Date created:				10 Jul 2003
-# Whom:					Oliver Eikemeier
-#
-# $FreeBSD$
-#
-
-PORTNAME=		openldap
-PORTVERSION=		2.2.10
-PORTREVISION=		${OPENLDAP_PORTREVISION}
-CATEGORIES=		net databases
-MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
-			http://public.planetmirror.com/pub/openldap/%SUBDIR%/ \
-			ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.matrix.com.br/pub/openldap/%SUBDIR%/ \
-			ftp://ftp.ucr.ac.cr/pub/Unix/openldap/%SUBDIR%/ \
-			ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.shellhung.org/pub/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.u-aizu.ac.jp/pub/net/openldap/%SUBDIR%/ \
-			ftp://ftp.holywar.net/pub/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.nl.uu.net/pub/unix/db/openldap/%SUBDIR%/ \
-			ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.rediris.es/mirror/OpenLDAP/%SUBDIR%/ \
-			ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
-			http://openldap.cdpa.nsysu.edu.tw/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.plig.org/pub/OpenLDAP/%SUBDIR%/
-MASTER_SITE_SUBDIR=	openldap-release
-PKGNAMESUFFIX=		${OPENLDAP_PKGNAMESUFFIX}
-EXTRACT_SUFX=		.tgz
-
-MAINTAINER=		eik@FreeBSD.org
-COMMENT?=		Open source LDAP server implementation
-
-LATEST_LINK=		${PKGNAMEPREFIX}openldap22${PKGNAMESUFFIX}
-
-WANT_OPENLDAP_VER?=	22
-.if ${WANT_OPENLDAP_VER} != 22
-BROKEN=			"incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}"
-.endif
-
-PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
-
-PKGNAMESUFFIX_CLIENT=	-client
-PKGNAMESUFFIX_SERVER=	-server
-
-.if defined(CLIENT_ONLY)
-OPENLDAP_PORTREVISION=	${PORTREVISION_CLIENT}
-OPENLDAP_PKGNAMESUFFIX=	${PKGNAMESUFFIX_CLIENT}
-OPENLDAP_PKGFILESUFX=	.client
-
-CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[013-9].* \
-			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[013-9].*
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=		drafts rfc
-.endif
-
-.if defined(USE_OPENLDAP)
-.error You have `USE_OPENLDAP' defined either in your environment or in make(1) arguments.
-.endif
-.else
-OPENLDAP_PORTREVISION=	${PORTREVISION_SERVER}
-OPENLDAP_PKGNAMESUFFIX=	${PKGNAMESUFFIX_SERVER}
-OPENLDAP_PKGFILESUFX=
-
-RUN_DEPENDS=		${LOCALBASE}/lib/libldap.so.202:${PORTSDIR}/net/openldap22-client
-#RUN_DEPENDS=		${LOCALBASE}/lib/libldap-2.2.so.7:${PORTSDIR}/net/openldap22-client
-CONFLICTS+=		${PKGNAMEPREFIX}${PORTNAME}-server-2.[013-9].* \
-			${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.[013-9].*
-
-.if ${PORTREVISION_CLIENT} != 0
-SUF1_CLIENT=		_${PORTREVISION_CLIENT}
-.endif
-
-PKGNAME_CLIENT=		${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX_CLIENT}-${PORTVERSION}${SUF1_CLIENT}
-.endif
-
-USE_OPENSSL=		yes
-USE_REINPLACE=		yes
-GNU_CONFIGURE=		yes
-
-DESCR=			${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
-PLIST=			${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
-PKGINSTALL=		${WRKDIR}/pkg-install
-PKGMESSAGE=		${WRKDIR}/pkg-message
-PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
-
-SCHEMATA=		corba core cosine \
-			dyngroup inetorgperson java \
-			misc nis openldap
-
-LDAP_RUN_DIR?=		${DESTDIR}/var/run/openldap
-LOCALSTATEDIR?=		${DESTDIR}/var/db
-DATABASEDIR?=		${LOCALSTATEDIR}/openldap-data
-SLURPDIR?=		${LOCALSTATEDIR}/openldap-slurp
-
-PLIST_SUB+=		LDAP_RUN_DIR=${LDAP_RUN_DIR} \
-			DATABASEDIR=${DATABASEDIR} \
-			SLURPDIR=${SLURPDIR} \
-
-SED_SCRIPT=		-e 's,%%PKGNAME%%,${PKGNAME},g' \
-			-e 's,%%PREFIX%%,${PREFIX},g' \
-			-e 's,%%LDAP_RUN_DIR%%,${LDAP_RUN_DIR},g' \
-			-e 's,%%DATABASEDIR%%,${DATABASEDIR},g' \
-			-e 's,%%SLURPDIR%%,${SLURPDIR},g'
-
-CONFIGURE_ARGS=		--with-threads=posix \
-			--with-tls=openssl \
-			--enable-dynamic
-
-.if defined(WITH_SASL)
-PKGNAMESUFFIX_CLIENT:=	-sasl${PKGNAMESUFFIX_CLIENT}
-PKGNAMESUFFIX_SERVER:=	-sasl${PKGNAMESUFFIX_SERVER}
-LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-CONFIGURE_ARGS+=	--with-cyrus-sasl
-.else
-CONFIGURE_ARGS+=	--without-cyrus-sasl
-.endif
-
-.if defined(CLIENT_ONLY)
-# client specific configuration
-
-CONFIGURE_ARGS+=	--disable-slapd
-
-INSTALLS_SHLIB=		yes
-
-.else
-# server specific configuration
-
-USE_RC_SUBR=		yes
-
-SED_SCRIPT+=		-e 's,%%PKGNAME_CLIENT%%,${PKGNAME_CLIENT},g' \
-			-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-			-e 's,%%RC_DIR%%,${RC_DIR},g' \
-			-e 's,%%RC_SUFX%%,${RC_SUFX},g'
-PLIST_SUB+=		RC_DIR=${RC_DIR} \
-			RC_SUFX=${RC_SUFX}
-
-EXTRA_PATCHES+=		${FILESDIR}/extrapatch-Makefile.in
-
-CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
-			--enable-ldbm \
-			--enable-crypt \
-			--enable-lmpasswd \
-			--enable-ldap \
-			--enable-meta \
-			--enable-rewrite \
-			--enable-null \
-			--enable-monitor
-
-.if defined(WITHOUT_BDB)
-CONFIGURE_ARGS+=	--with-ldbm-api=bcompat \
-			--disable-bdb
-.else
-WITH_BDB_VER?=		42
-
-.if ${WITH_BDB_VER} == 42
-CONFIGURE_ARGS+=	--enable-bdb
-BDBLIB=			db-4.2.2
-.elif ${WITH_BDB_VER} == 41
-CONFIGURE_ARGS+=	--disable-bdb
-BDBLIB=			db41.1
-.elif ${WITH_BDB_VER} == 4
-CONFIGURE_ARGS+=	--disable-bdb
-BDBLIB=			db4.0
-.elif ${WITH_BDB_VER} == 3
-CONFIGURE_ARGS+=	--disable-bdb
-BDBLIB=			db3.3
-.else
-.error WITH_BDB_VER must be 3, 4, 41 or 42
-.endif
-
-LIB_DEPENDS+=		${BDBLIB}:${PORTSDIR}/databases/db${WITH_BDB_VER}
-CPPFLAGS+=		-I${LOCALBASE}/include/db${WITH_BDB_VER}
-CONFIGURE_ARGS+=	--with-ldbm-api=berkeley \
-			--enable-hdb
-CONFIGURE_SED+=		-e 's,ol_DB_LIB=$$,&-l${BDBLIB:R},' \
-			-e 's,(ol_cv_lib_db=)yes$$,\1-l${BDBLIB:R},'
-.endif
-
-.if defined(WITH_SHELL)
-CONFIGURE_ARGS+=	--enable-shell
-.endif
-
-.if defined(WITH_PERL)
-USE_PERL5=	yes
-CONFIGURE_ARGS+=	--enable-perl
-.endif
-
-.if defined(WITH_SASL)
-CONFIGURE_ARGS+=	--enable-spasswd
-.endif
-
-.if defined(WITH_ODBC)
-WITH_ODBC_TYPE?=	iODBC
-.endif
-.if defined(WITH_ODBC_TYPE)
-CONFIGURE_ARGS+=	--enable-sql
-.if ${WITH_ODBC_TYPE:L} == iodbc
-LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
-.elif ${WITH_ODBC_TYPE:L} == unixodbc
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
-.else
-.error WITH_ODBC_TYPE must be iODBC or unixODBC
-.endif
-.endif
-
-.if defined(WITH_SLAPI)
-LIB_DEPENDS+=		ltdl.4:${PORTSDIR}/devel/libltdl
-CONFIGURE_ARGS+=	--enable-slapi \
-			--enable-modules
-PLIST_SUB+=		SLAPI=""
-INSTALLS_SHLIB=		yes
-.else
-PLIST_SUB+=		SLAPI="@comment "
-.endif
-
-# Include tcp-wrapper support
-.if !defined(WITHOUT_TCP_WRAPPERS) && exists(/usr/include/tcpd.h)
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
-
-# end of client/server specific configuration
-.endif
-
-CPPFLAGS+=		${PTHREAD_CFLAGS} \
-			-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
-#LIBS+=			${PTHREAD_LIBS}
-
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			LIBS="${LIBS}"
-
-.include <bsd.port.pre.mk>
-
-.if defined(CLIENT_ONLY)
-.include "${FILESDIR}/manpages"
-.else
-.if ${OSVERSION} >= 500038
-RC_DIR=		${DESTDIR}/etc/rc.d
-RC_SUFX=
-.else
-RC_DIR=		${PREFIX}/etc/rc.d
-RC_SUFX=	.sh
-.endif
-.endif
-
-pre-everything::
-	@${ECHO} "============================================================="
-	@${ECHO}
-	@${ECHO} "You can build ${PKGNAME} with the following options:"
-	@${ECHO}
-.if defined(CLIENT_ONLY)
-	@${ECHO} "WITH_SASL             with (Cyrus) SASL2 support"
-.else
-	@${ECHO} "WITH_BDB_VER          select BerkeleyDB version (default 42)"
-	@${ECHO} "WITH_SASL             with (Cyrus) SASL2 password verification"
-	@${ECHO} "WITH_PERL             with Perl backend"
-	@${ECHO} "WITH_SHELL            with Shell backend"
-	@${ECHO} "WITH_ODBC             with SQL backend"
-	@${ECHO} "WITH_ODBC_TYPE        select ODBC interface (iODBC or unixODBC)"
-	@${ECHO} "WITH_SLAPI            with Netscape SLAPI plugin API
-	@${ECHO} "WITHOUT_TCP_WRAPPERS  without tcp wrapper support"
-	@${ECHO} "WITHOUT_BDB           without BerkeleyDB support"
-.endif
-	@${ECHO}
-	@${ECHO} "============================================================="
-	@${ECHO}
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,%LOCALSTATEDIR%/run/,${LDAP_RUN_DIR}/,g' \
-		${WRKSRC}/servers/slapd/slapd.conf
-.if defined(CONFIGURE_SED)
-	@${REINPLACE_CMD} -E ${CONFIGURE_SED} \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.endif
-
-pre-configure:
-	@if [ -n "`${PKG_INFO} -xI '^bind\(84\)\{0,1\}-base-8\.' 2>/dev/null`" ]; then \
-		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
-		${FALSE}; \
-	fi
-
-post-build:
-.for script in slapd slurpd
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/${script}.sh >${WRKDIR}/${script}.sh
-.endfor
-.for text in pkg-install pkg-message pkg-deinstall
-	@if [ -f ${PKGDIR}/${text}${OPENLDAP_PKGFILESUFX} ]; then \
-		${SED} ${SED_SCRIPT} ${PKGDIR}/${text}${OPENLDAP_PKGFILESUFX} \
-		>${WRKDIR}/${text}; \
-	fi
-.endfor
-
-.if !defined(CLIENT_ONLY)
-test: build
-	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
-		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
-.endif
-
-pre-install:
-	@if [ -f ${PKGINSTALL} ]; then \
-		${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL; \
-	fi
-
-post-install:
-.if defined(CLIENT_ONLY)
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@for dir in drafts rfc; do \
-		${MKDIR} ${DOCSDIR}/$${dir}; \
-		${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${DOCSDIR}/$${dir}; \
-	done
-.endif
-.else
-	@for schema in ${SCHEMATA}; do \
-		${ECHO_CMD} "@unexec if cmp -s %D/etc/openldap/schema/$${schema}.schema" \
-			"%D/etc/openldap/schema/$${schema}.schema.default; then" \
-			"rm -f %D/etc/openldap/schema/$${schema}.schema; fi" >>${TMPPLIST}; \
-		${ECHO_CMD} "etc/openldap/schema/$${schema}.schema.default" >>${TMPPLIST}; \
-		${ECHO_CMD} "@exec [ -f %B/$${schema}.schema ] || cp %B/%f %B/$${schema}.schema" >>${TMPPLIST}; \
-	done
-	@${ECHO_CMD} "@unexec rmdir %D/etc/openldap/schema 2>/dev/null || true" >>${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/etc/openldap 2>/dev/null || true" >>${TMPPLIST}
-#	currently the only way to participate in rcorder(8)
-	@if [ "${RC_DIR}" != "${PREFIX}" ]; then \
-		${ECHO_CMD} "@cwd ${RC_DIR}" >>${TMPPLIST}; \
-	fi
-.for script in slapd slurpd
-	@${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${RC_DIR}/${script}${RC_SUFX}
-	@${ECHO_CMD} "${script}${RC_SUFX}" >>${TMPPLIST}
-.endfor
-	@${MKDIR} ${LDAP_RUN_DIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/net/openldap23-server/distinfo b/net/openldap23-server/distinfo
deleted file mode 100644
index c62d2c991478..000000000000
--- a/net/openldap23-server/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (openldap-2.2.10.tgz) = 3620465b331626308463a7651e4fb9c6
-SIZE (openldap-2.2.10.tgz) = 2558755
diff --git a/net/openldap23-server/files/extrapatch-Makefile.in b/net/openldap23-server/files/extrapatch-Makefile.in
deleted file mode 100644
index bb83ea2b572a..000000000000
--- a/net/openldap23-server/files/extrapatch-Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.in.orig	Mon Apr  7 22:23:24 2003
-+++ Makefile.in	Thu Jul 10 17:43:35 2003
-@@ -10,9 +10,11 @@
- ## in file LICENSE in the top-level directory of the distribution.
- ##
- 
--SUBDIRS= include libraries clients servers tests doc
--CLEANDIRS=
--INSTALLDIRS= 
-+SUBDIRS=
-+ALLDIRS= include libraries clients servers tests doc
-+CLEANDIRS= include libraries clients servers tests doc
-+DEPENDDIRS= include libraries clients servers tests doc
-+INSTALLDIRS=  servers
- 
- makefiles:	FORCE
- 	./config.status
diff --git a/net/openldap23-server/files/manpages b/net/openldap23-server/files/manpages
deleted file mode 100644
index bf7071542349..000000000000
--- a/net/openldap23-server/files/manpages
+++ /dev/null
@@ -1,194 +0,0 @@
-#
-# $FreeBSD$
-#
-
-MAN1+=	ldapcompare.1 \
-	ldapdelete.1 \
-	ldapmodify.1 \
-	ldapmodrdn.1 \
-	ldappasswd.1 \
-	ldapsearch.1 \
-	ldapwhoami.1
-MLINKS+= \
-	ldapmodify.1 ldapadd.1
-
-MAN3+=	lber-decode.3 \
-	lber-encode.3 \
-	lber-memory.3 \
-	lber-types.3 \
-	ldap.3 \
-	ldap_abandon.3 \
-	ldap_add.3 \
-	ldap_bind.3 \
-	ldap_compare.3 \
-	ldap_delete.3 \
-	ldap_error.3 \
-	ldap_first_attribute.3 \
-	ldap_first_entry.3 \
-	ldap_first_message.3 \
-	ldap_first_reference.3 \
-	ldap_get_dn.3 \
-	ldap_get_values.3 \
-	ldap_modify.3 \
-	ldap_modrdn.3 \
-	ldap_open.3 \
-	ldap_parse_reference.3 \
-	ldap_parse_result.3 \
-	ldap_result.3 \
-	ldap_schema.3 \
-	ldap_search.3 \
-	ldap_sort.3 \
-	ldap_url.3
-MLINKS+= \
-	lber-decode.3 ber_first_element.3 \
-	lber-decode.3 ber_get_bitstring.3 \
-	lber-decode.3 ber_get_boolean.3 \
-	lber-decode.3 ber_get_enum.3 \
-	lber-decode.3 ber_get_int.3 \
-	lber-decode.3 ber_get_next.3 \
-	lber-decode.3 ber_get_null.3 \
-	lber-decode.3 ber_get_stringa.3 \
-	lber-decode.3 ber_get_stringb.3 \
-	lber-decode.3 ber_next_element.3 \
-	lber-decode.3 ber_peek_tag.3 \
-	lber-decode.3 ber_scanf.3 \
-	lber-decode.3 ber_skip_tag.3 \
-	lber-encode.3 ber_alloc_t.3 \
-	lber-encode.3 ber_flush.3 \
-	lber-encode.3 ber_printf.3 \
-	lber-encode.3 ber_put_enum.3 \
-	lber-encode.3 ber_put_int.3 \
-	lber-encode.3 ber_put_null.3 \
-	lber-encode.3 ber_put_ostring.3 \
-	lber-encode.3 ber_put_seq.3 \
-	lber-encode.3 ber_put_set.3 \
-	lber-encode.3 ber_put_string.3 \
-	lber-encode.3 ber_start_set.3 \
-	lber-types.3 ber_bvarray_add.3 \
-	lber-types.3 ber_bvarray_free.3 \
-	lber-types.3 ber_bvdup.3 \
-	lber-types.3 ber_bvecadd.3 \
-	lber-types.3 ber_bvecfree.3 \
-	lber-types.3 ber_bvfree.3 \
-	lber-types.3 ber_bvstr.3 \
-	lber-types.3 ber_bvstrdup.3 \
-	lber-types.3 ber_dupbv.3 \
-	lber-types.3 ber_free.3 \
-	lber-types.3 ber_str2bv.3 \
-	ldap_abandon.3 ldap_abandon_ext.3 \
-	ldap_add.3 ldap_add_ext.3 \
-	ldap_add.3 ldap_add_ext_s.3 \
-	ldap_add.3 ldap_add_s.3 \
-	ldap_bind.3 ldap_bind_s.3 \
-	ldap_bind.3 ldap_kerberos_bind1.3 \
-	ldap_bind.3 ldap_kerberos_bind1_s.3 \
-	ldap_bind.3 ldap_kerberos_bind2.3 \
-	ldap_bind.3 ldap_kerberos_bind2_s.3 \
-	ldap_bind.3 ldap_kerberos_bind_s.3 \
-	ldap_bind.3 ldap_sasl_bind.3 \
-	ldap_bind.3 ldap_sasl_bind_s.3 \
-	ldap_bind.3 ldap_simple_bind.3 \
-	ldap_bind.3 ldap_simple_bind_s.3 \
-	ldap_bind.3 ldap_unbind.3 \
-	ldap_bind.3 ldap_unbind_ext.3 \
-	ldap_bind.3 ldap_unbind_ext_s.3 \
-	ldap_bind.3 ldap_unbind_s.3 \
-	ldap_compare.3 ldap_compare_ext.3 \
-	ldap_compare.3 ldap_compare_ext_s.3 \
-	ldap_compare.3 ldap_compare_s.3 \
-	ldap_delete.3 ldap_delete_ext.3 \
-	ldap_delete.3 ldap_delete_ext_s.3 \
-	ldap_delete.3 ldap_delete_s.3 \
-	ldap_error.3 ld_errno.3 \
-	ldap_error.3 ldap_err2string.3 \
-	ldap_error.3 ldap_errlist.3 \
-	ldap_error.3 ldap_perror.3 \
-	ldap_error.3 ldap_result2error.3 \
-	ldap_first_attribute.3 ldap_next_attribute.3 \
-	ldap_first_entry.3 ldap_count_entries.3 \
-	ldap_first_entry.3 ldap_next_entry.3 \
-	ldap_first_message.3 ldap_count_messages.3 \
-	ldap_first_message.3 ldap_next_message.3 \
-	ldap_first_reference.3 ldap_count_references.3 \
-	ldap_first_reference.3 ldap_next_reference.3 \
-	ldap_get_dn.3 ldap_dcedn2dn.3 \
-	ldap_get_dn.3 ldap_dn2ad_canonical.3 \
-	ldap_get_dn.3 ldap_dn2dcedn.3 \
-	ldap_get_dn.3 ldap_dn2str.3 \
-	ldap_get_dn.3 ldap_dn2ufn.3 \
-	ldap_get_dn.3 ldap_explode_dn.3 \
-	ldap_get_dn.3 ldap_explode_rdn.3 \
-	ldap_get_dn.3 ldap_str2dn.3 \
-	ldap_get_values.3 ldap_count_values.3 \
-	ldap_get_values.3 ldap_count_values_len.3 \
-	ldap_get_values.3 ldap_get_values_len.3 \
-	ldap_get_values.3 ldap_value_free.3 \
-	ldap_get_values.3 ldap_value_free_len.3 \
-	ldap_modify.3 ldap_modify_ext.3 \
-	ldap_modify.3 ldap_modify_ext_s.3 \
-	ldap_modify.3 ldap_modify_s.3 \
-	ldap_modify.3 ldap_mods_free.3 \
-	ldap_modrdn.3 ldap_modrdn2.3 \
-	ldap_modrdn.3 ldap_modrdn2_s.3 \
-	ldap_modrdn.3 ldap_modrdn_s.3 \
-	ldap_open.3 ldap_init.3 \
-	ldap_parse_result.3 ldap_parse_extended_result.3 \
-	ldap_parse_result.3 ldap_parse_sasl_bind_result.3 \
-	ldap_result.3 ldap_msgfree.3 \
-	ldap_result.3 ldap_msgid.3 \
-	ldap_result.3 ldap_msgtype.3 \
-	ldap_schema.3 ldap_attributetype2name.3 \
-	ldap_schema.3 ldap_attributetype2str.3 \
-	ldap_schema.3 ldap_attributetype_free.3 \
-	ldap_schema.3 ldap_matchingrule2name.3 \
-	ldap_schema.3 ldap_matchingrule2str.3 \
-	ldap_schema.3 ldap_matchingrule_free.3 \
-	ldap_schema.3 ldap_objectclass2name.3 \
-	ldap_schema.3 ldap_objectclass2str.3 \
-	ldap_schema.3 ldap_objectclass_free.3 \
-	ldap_schema.3 ldap_scherr2str.3 \
-	ldap_schema.3 ldap_str2attributetype.3 \
-	ldap_schema.3 ldap_str2matchingrule.3 \
-	ldap_schema.3 ldap_str2objectclass.3 \
-	ldap_schema.3 ldap_str2syntax.3 \
-	ldap_schema.3 ldap_syntax2name.3 \
-	ldap_schema.3 ldap_syntax2str.3 \
-	ldap_schema.3 ldap_syntax_free.3 \
-	ldap_search.3 ldap_search_ext.3 \
-	ldap_search.3 ldap_search_ext_s.3 \
-	ldap_search.3 ldap_search_s.3 \
-	ldap_search.3 ldap_search_st.3 \
-	ldap_sort.3 ldap_sort_entries.3 \
-	ldap_sort.3 ldap_sort_strcasecmp.3 \
-	ldap_sort.3 ldap_sort_values.3 \
-	ldap_url.3 ldap_free_urldesc.3 \
-	ldap_url.3 ldap_is_ldap_url.3 \
-	ldap_url.3 ldap_url_parse.3
-
-MAN5+=	ldap.conf.5 \
-	ldif.5 \
-	slapd-bdb.5 \
-	slapd-dnssrv.5 \
-	slapd-ldap.5 \
-	slapd-ldbm.5 \
-	slapd-meta.5 \
-	slapd-monitor.5 \
-	slapd-null.5 \
-	slapd-passwd.5 \
-	slapd-perl.5 \
-	slapd-shell.5 \
-	slapd-sql.5 \
-	slapd-tcl.5 \
-	slapd.access.5 \
-	slapd.conf.5 \
-	slapd.plugin.5 \
-	slapd.replog.5
-
-MAN8+=	slapadd.8 \
-	slapcat.8 \
-	slapd.8 \
-	slapdn.8 \
-	slapindex.8 \
-	slappasswd.8 \
-	slaptest.8 \
-	slurpd.8
diff --git a/net/openldap23-server/files/patch-build::ltmain.sh b/net/openldap23-server/files/patch-build::ltmain.sh
deleted file mode 100644
index 515dd96d8756..000000000000
--- a/net/openldap23-server/files/patch-build::ltmain.sh
+++ /dev/null
@@ -1,46 +0,0 @@
---- build/ltmain.sh.orig	Thu Jan  1 19:16:25 2004
-+++ build/ltmain.sh	Sun Mar 28 14:58:06 2004
-@@ -1076,7 +1076,7 @@
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -1088,6 +1088,12 @@
- 
-       -module)
- 	module=yes
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not build the useless static library
-+	  build_old_libs=no
-+	  ;;
-+	esac
- 	continue
- 	;;
- 
-@@ -4296,10 +4302,17 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
--	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--	instname="$dir/$name"i
--	$show "$install_prog $instname $destdir/$name"
--	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not install the useless pseudo-library
-+	  ;;
-+	*)
-+	  name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	  instname="$dir/$name"i
-+	  $show "$install_prog $instname $destdir/$name"
-+	  $run eval "$install_prog $instname $destdir/$name" || exit $?
-+	  ;;
-+	esac
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net/openldap23-server/files/patch-build::top.mk b/net/openldap23-server/files/patch-build::top.mk
deleted file mode 100644
index b6ec9f5e1657..000000000000
--- a/net/openldap23-server/files/patch-build::top.mk
+++ /dev/null
@@ -1,20 +0,0 @@
---- build/top.mk.orig	Wed Mar 24 22:51:22 2004
-+++ build/top.mk	Wed Mar 31 22:28:53 2004
-@@ -69,7 +69,7 @@
- LIBTOOL = @LIBTOOL@
- LIBRELEASE = @OPENLDAP_LIBRELEASE@
- LIBVERSION = @OPENLDAP_LIBVERSION@
--LTVERSION = -release $(LIBRELEASE) -version-info $(LIBVERSION)
-+LTVERSION = -version-info $(LIBVERSION)
- 
- # libtool --only flag for libraries: platform specific
- NT_LTONLY_LIB = # --only-$(BUILD_LIBS_DYNAMIC)
-@@ -191,6 +191,8 @@
- 
- SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@
- SLURPD_LIBS = @SLURPD_LIBS@
-+
-+SLAPI_LIBS = @SLAPI_LIBS@
- 
- # Our Defaults
- CC = $(AC_CC)
diff --git a/net/openldap23-server/files/patch-build::version.var b/net/openldap23-server/files/patch-build::version.var
deleted file mode 100644
index 0a60e601f13a..000000000000
--- a/net/openldap23-server/files/patch-build::version.var
+++ /dev/null
@@ -1,13 +0,0 @@
---- build/version.var.orig	Fri Apr 16 17:34:39 2004
-+++ build/version.var	Fri Apr 16 22:56:05 2004
-@@ -17,7 +17,7 @@
- ol_minor=2
- ol_patch=10
- ol_api_inc=20210
--ol_api_current=7
--ol_api_revision=3
--ol_api_age=0
-+ol_api_current=202
-+ol_api_revision=2
-+ol_api_age=200
- ol_release_date="2004/04/16"
diff --git a/net/openldap23-server/files/patch-servers::slapd::Makefile.in b/net/openldap23-server/files/patch-servers::slapd::Makefile.in
deleted file mode 100644
index c55fcd9b7c59..000000000000
--- a/net/openldap23-server/files/patch-servers::slapd::Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- servers/slapd/Makefile.in.orig	Mon Dec 29 19:10:38 2003
-+++ servers/slapd/Makefile.in	Tue Jan 20 02:33:39 2004
-@@ -343,7 +343,6 @@
- 
- install-slapd: FORCE
- 	-$(MKDIR) $(DESTDIR)$(libexecdir)
--	-$(MKDIR) $(DESTDIR)$(localstatedir)/run
- 	$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
- 		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
- 	@for i in $(SUBDIRS); do \
diff --git a/net/openldap23-server/files/slapd.sh b/net/openldap23-server/files/slapd.sh
deleted file mode 100644
index fb77d4374fd0..000000000000
--- a/net/openldap23-server/files/slapd.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: slapd
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable slapd:
-#
-#slapd_enable="YES"
-#slapd_flags='-h "ldapi://%2fvar%2frun%2fopenldap%2fldapi/ ldap://0.0.0.0/"'
-#slapd_sockets="/var/run/openldap/ldapi"
-#
-# See slapd(8) for more flags
-#
-# The `-u' and `-g' flags are automatically extracted from slapd_owner,
-# by default slapd runs under the non-privileged user id `ldap'. If you
-# want to run slapd as root, override this in /etc/rc.conf with
-#
-#slapd_owner="DEFAULT"
-#
-
-. %%RC_SUBR%%
-
-name=slapd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/libexec/slapd
-pidfile=%%LDAP_RUN_DIR%%/slapd.pid
-required_dirs=%%LDAP_RUN_DIR%%
-required_files=%%PREFIX%%/etc/openldap/slapd.conf
-
-start_precmd=start_precmd
-start_postcmd=start_postcmd
-
-# extract user and group, adjust ownership of directories and database
-
-start_precmd()
-{
-  case x"$slapd_owner" in
-  x|x[Nn][Oo][Nn][Ee]|x[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
-    ;;
-  x*)
-    chown "$slapd_owner" "%%LDAP_RUN_DIR%%"
-    chown -RL "$slapd_owner" "%%DATABASEDIR%%"
-    chown "$slapd_owner" "%%PREFIX%%/etc/openldap/slapd.conf"
-
-    slapd_ownername=`expr //"$slapd_owner" : //'\([^:]*\)'`
-    slapd_groupname=`expr //"$slapd_owner" : //'.*:\([^:]*\)'`
-
-    if [ -n "$slapd_ownername" ]; then
-      rc_flags="$rc_flags -u $slapd_ownername"
-    fi
-    if [ -n "$slapd_groupname" ]; then
-      rc_flags="$rc_flags -g $slapd_groupname"
-    fi
-    ;;
-  esac
-}
-
-# adjust ownership of created unix sockets
-
-start_postcmd()
-{
-  for socket in $slapd_sockets; do
-    for seconds in 1 2 3 4 5; do
-      [ -e "$socket" ] && break
-      sleep 1
-    done
-    if [ -S "$socket" ]; then
-      case x"$slapd_owner" in
-      x|x[Nn][Oo][Nn][Ee]|x[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
-        ;;
-      x*)
-        chown "$slapd_owner" "$socket"
-        ;;
-      esac
-      chmod "$slapd_sockets_mode" "$socket"
-    fi
-  done
-}
-
-# set defaults
-
-[ -z "$slapd_enable" ]       && slapd_enable=NO
-[ -z "$slapd_flags" ]        && slapd_flags=
-
-[ -z "$slapd_owner" ]        && slapd_owner=ldap:ldap
-[ -z "$slapd_sockets" ]      && slapd_sockets=
-[ -z "$slapd_sockets_mode" ] && slapd_sockets_mode=666
-
-load_rc_config $name
-
-if [ -n "$slapd_args" ]; then
-  warn "slapd_args is deprecated, use slapd_flags"
-  slapd_flags="$slapd_args"
-fi
-
-run_rc_command "$1"
diff --git a/net/openldap23-server/files/slurpd.sh b/net/openldap23-server/files/slurpd.sh
deleted file mode 100644
index 558f58c1f592..000000000000
--- a/net/openldap23-server/files/slurpd.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: slurpd
-# REQUIRE: slapd
-# BEFORE:
-# KEYWORD: FreeBSD shutdown
-
-# Add the following line to /etc/rc.conf to enable slurpd:
-#
-#slurpd_enable="YES"
-#
-# See slurpd(8) for more flags
-#
-
-. %%RC_SUBR%%
-
-name=slurpd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/libexec/slurpd
-required_files=%%PREFIX%%/etc/openldap/slapd.conf
-
-[ -z "$slurpd_enable" ] && slurpd_enable="NO"
-[ -z "$slurpd_flags" ]  && slurpd_flags=
-
-load_rc_config $name
-
-if [ -n "$slurpd_args" ]; then
-  warn "slurpd_args is deprecated, use slurpd_flags"
-  slurpd_flags="$slurpd_args"
-fi
-
-run_rc_command "$1"
diff --git a/net/openldap23-server/pkg-deinstall b/net/openldap23-server/pkg-deinstall
deleted file mode 100644
index 2a5ec1ef8f65..000000000000
--- a/net/openldap23-server/pkg-deinstall
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-ECHO_CMD=echo
-
-case $2 in
-POST-DEINSTALL)
-  ${ECHO_CMD}
-  ${ECHO_CMD} "The OpenLDAP server package has been deleted."
-  ${ECHO_CMD} "If you're *not* upgrading and won't be using"
-  ${ECHO_CMD} "it any longer, you may want to issue the"
-  ${ECHO_CMD} "following commands:"
-  ${ECHO_CMD}
-  if [ -d %%DATABASEDIR%% ]; then
-    ${ECHO_CMD} "- to delete the OpenLDAP database permanently (losing all data):"
-    ${ECHO_CMD} "  rm -Rf %%DATABASEDIR%%"
-    ${ECHO_CMD}
-  fi
-  if [ -d %%SLURPDIR%% ]; then
-    ${ECHO_CMD} "- to remove the OpenLDAP replication directory:"
-    ${ECHO_CMD} "  rm -Rf %%SLURPDIR%%"
-    ${ECHO_CMD}
-  fi
-  ${ECHO_CMD} "- to remove the OpenLDAP user:"
-  ${ECHO_CMD} "  pw userdel ldap"
-  ${ECHO_CMD}
-  ${ECHO_CMD} "If you are upgrading, don't forget to restart"
-  ${ECHO_CMD} "slapd and slurpd."
-  ${ECHO_CMD}
-  ;;
-esac
diff --git a/net/openldap23-server/pkg-descr b/net/openldap23-server/pkg-descr
deleted file mode 100644
index 509e40a2462f..000000000000
--- a/net/openldap23-server/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-OpenLDAP is a suite of Lightweight Directory Access Protocol (v3) servers,
-clients, utilities and development tools.
-
-This package includes the following major components:
-
- * slapd - a stand-alone LDAP directory server
- * slurpd - a stand-alone LDAP replication server
- * LDIF tools - data conversion tools for use with slapd
-
-This is the latest release of OpenLDAP Software for general use.
-
-WWW: http://www.OpenLDAP.org/
-
-- Oliver Eikemeier
-eikemeier@fillmore-labs.com
diff --git a/net/openldap23-server/pkg-descr.client b/net/openldap23-server/pkg-descr.client
deleted file mode 100644
index 7e508c450d4a..000000000000
--- a/net/openldap23-server/pkg-descr.client
+++ /dev/null
@@ -1,16 +0,0 @@
-OpenLDAP is a suite of Lightweight Directory Access Protocol (v3) servers,
-clients, utilities and development tools.
-
-This package includes the following major components:
-
- * -lldap - a LDAP client library
- * -llber - a lightweight BER/DER encoding/decoding library
- * LDAP tools - A collection of command line LDAP utilities
- * documentation - man pages for all components
-
-This is the latest release of OpenLDAP Software for general use.
-
-WWW: http://www.OpenLDAP.org/
-
-- Oliver Eikemeier
-eikemeier@fillmore-labs.com
diff --git a/net/openldap23-server/pkg-install b/net/openldap23-server/pkg-install
deleted file mode 100644
index 593e92c14a5e..000000000000
--- a/net/openldap23-server/pkg-install
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-CHOWN=/usr/sbin/chown
-ECHO_CMD=echo
-GREP=/usr/bin/grep
-PKG_INFO=/usr/sbin/pkg_info
-PW=/usr/sbin/pw
-
-FTPUSERS=/etc/ftpusers
-
-case $2 in
-PRE-INSTALL)
-  if ! ${PKG_INFO} -e '%%PKGNAME_CLIENT%%'; then
-    ${ECHO_CMD} "===>  %%PKGNAME%% requires %%PKGNAME_CLIENT%%."
-    ${ECHO_CMD}
-    ${ECHO_CMD} "      Please install %%PKGNAME_CLIENT%% manually."
-    exit 1
-  fi
-  if ! ${PW} usershow -n ldap >/dev/null 2>&1; then
-    ${ECHO_CMD}
-    if ! ${PW} groupshow -n ldap >/dev/null 2>&1; then
-      if ! ${PW} groupadd -n ldap -g 389; then
-        ${ECHO_CMD} "*** Failed to add a group ldap with id 389."
-        ${ECHO_CMD}
-        ${ECHO_CMD} "Please add the ldap user manually with"
-        ${ECHO_CMD} "  ${PW} useradd -n ldap -g ldap -c 'OpenLDAP server' \\"
-        ${ECHO_CMD} "  -d /nonexistent -s /sbin/nologin -h -"        
-        ${ECHO_CMD} "and retry installing this package."
-        exit 1
-      fi
-      ${ECHO_CMD} "===>  Group 'ldap' created."
-    fi
-    if ! ${PW} useradd -n ldap -u 389 -g ldap -c 'OpenLDAP Server' \
-        -d /nonexistent -s /sbin/nologin -h -; then
-      ${ECHO_CMD} "*** Failed to add an user ldap with id 389."
-      ${ECHO_CMD}
-      ${ECHO_CMD} "Please add the ldap user manually with"
-      ${ECHO_CMD} "  ${PW} useradd -n ldap -g ldap -c 'OpenLDAP server' \\"
-      ${ECHO_CMD} "  -d /nonexistent -s /sbin/nologin -h -"        
-      ${ECHO_CMD} "and retry installing this package."
-      exit 1
-    fi
-    ${GREP} -qs '^ldap$' ${FTPUSERS} || ${ECHO_CMD} ldap >> ${FTPUSERS}
-    ${ECHO_CMD} "===>  Account 'ldap' created."
-  fi
-  ;;
-esac
diff --git a/net/openldap23-server/pkg-message b/net/openldap23-server/pkg-message
deleted file mode 100644
index 2317ce44f955..000000000000
--- a/net/openldap23-server/pkg-message
+++ /dev/null
@@ -1,28 +0,0 @@
-************************************************************
-
-The OpenLDAP server package has been successfully installed.
-
-In order to run the LDAP server, you need to edit
-  %%PREFIX%%/etc/openldap/slapd.conf
-to suit your needs and add the following lines to /etc/rc.conf:
-  slapd_enable="YES"
-  slapd_flags='-h "ldapi://%2fvar%2frun%2fopenldap%2fldapi/ ldap://0.0.0.0/"'
-  slapd_sockets="/var/run/openldap/ldapi"
-
-Then start the server with
-  %%RC_DIR%%/slapd%%RC_SUFX%% start
-or reboot.
-
-Try `man slapd' and the online manual at
-  http://www.OpenLDAP.org/doc/admin22/
-for more information.
-  
-NOTE: Some variable names have been changed to conform with rc.subr(8)
-
-If you are upgrading, you may want to check your configuration with
-  grep ^slapd_ /etc/rc.conf
-
-slapd runs under a non-privileged user id (by default `ldap'),
-see %%RC_DIR%%/slapd%%RC_SUFX%% for more information.
-
-************************************************************
diff --git a/net/openldap23-server/pkg-message.client b/net/openldap23-server/pkg-message.client
deleted file mode 100644
index 92ef70d0f99b..000000000000
--- a/net/openldap23-server/pkg-message.client
+++ /dev/null
@@ -1,13 +0,0 @@
-************************************************************
-
-The OpenLDAP client package has been successfully installed.
-
-Edit
-  %%PREFIX%%/etc/openldap/ldap.conf
-to change the system-wide client defaults.
-
-Try `man ldap.conf' and visit the OpenLDAP FAQ-O-Matic at
-  http://www.OpenLDAP.org/faq/index.cgi?file=3
-for more information.
-
-************************************************************
diff --git a/net/openldap23-server/pkg-plist b/net/openldap23-server/pkg-plist
deleted file mode 100644
index 8ebdafd53d13..000000000000
--- a/net/openldap23-server/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $FreeBSD$
-@unexec %%RC_DIR%%/slapd%%RC_SUFX%% stop 2>&1 >/dev/null || true
-@unexec %%RC_DIR%%/slurpd%%RC_SUFX%% stop 2>&1 >/dev/null || true
-etc/openldap/schema/README
-@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
-%%SLAPI%%lib/libslapi.a
-%%SLAPI%%lib/libslapi.so
-%%SLAPI%%lib/libslapi.so.202
-@comment %%SLAPI%%lib/libslapi-2.2.so
-@comment %%SLAPI%%lib/libslapi-2.2.so.7
-libexec/slapd
-libexec/slurpd
-sbin/slapadd
-sbin/slapcat
-sbin/slapdn
-sbin/slapindex
-sbin/slappasswd
-sbin/slaptest
-@exec mkdir -p %%LDAP_RUN_DIR%%
-@unexec rmdir %%LDAP_RUN_DIR%% 2>/dev/null || true
-@exec mkdir -p %%DATABASEDIR%%
-@unexec rmdir %%DATABASEDIR%% 2>/dev/null || true
-@exec mkdir -p %%SLURPDIR%%
-@unexec rmdir %%SLURPDIR%% 2>/dev/null || true
diff --git a/net/openldap23-server/pkg-plist.client b/net/openldap23-server/pkg-plist.client
deleted file mode 100644
index dcc079b0ec30..000000000000
--- a/net/openldap23-server/pkg-plist.client
+++ /dev/null
@@ -1,45 +0,0 @@
-@comment $FreeBSD$
-bin/ldapadd
-bin/ldapcompare
-bin/ldapdelete
-bin/ldapmodify
-bin/ldapmodrdn
-bin/ldappasswd
-bin/ldapsearch
-bin/ldapwhoami
-@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 rmdir %D/etc/openldap 2>/dev/null || true
-include/lber.h
-include/lber_types.h
-include/ldap.h
-include/ldap_cdefs.h
-include/ldap_features.h
-include/ldap_schema.h
-include/ldap_utf8.h
-include/slapi-plugin.h
-lib/liblber.a
-lib/liblber.so
-lib/liblber.so.202
-@comment lib/liblber-2.2.so
-@comment lib/liblber-2.2.so.7
-lib/libldap.a
-lib/libldap.so
-lib/libldap.so.202
-@comment lib/libldap-2.2.so
-@comment lib/libldap-2.2.so.7
-lib/libldap_r.a
-lib/libldap_r.so
-lib/libldap_r.so.202
-@comment lib/libldap_r-2.2.so
-@comment lib/libldap_r-2.2.so.7
-share/openldap/ucdata/case.dat
-share/openldap/ucdata/cmbcl.dat
-share/openldap/ucdata/comp.dat
-share/openldap/ucdata/ctype.dat
-share/openldap/ucdata/decomp.dat
-share/openldap/ucdata/kdecomp.dat
-share/openldap/ucdata/num.dat
-@dirrm share/openldap/ucdata
-@dirrm share/openldap
diff --git a/net/openldap24-client/Makefile b/net/openldap24-client/Makefile
deleted file mode 100644
index 172fa7d40eec..000000000000
--- a/net/openldap24-client/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# New ports collection makefile for:	openldap22-client
-# Date created:				10 Jul 2003
-# Whom:					Oliver Eikemeier <eikemeier@fillmore-labs.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=		openldap
-
-COMMENT=		Open source LDAP client implementation
-
-CLIENT_ONLY=		yes
-
-MASTERDIR=		${.CURDIR}/../openldap22-server
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
deleted file mode 100644
index 29fc20f58db3..000000000000
--- a/net/openldap24-server/Makefile
+++ /dev/null
@@ -1,341 +0,0 @@
-# New ports collection makefile for:	openldap22-server
-# Date created:				10 Jul 2003
-# Whom:					Oliver Eikemeier
-#
-# $FreeBSD$
-#
-
-PORTNAME=		openldap
-PORTVERSION=		2.2.10
-PORTREVISION=		${OPENLDAP_PORTREVISION}
-CATEGORIES=		net databases
-MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
-			http://public.planetmirror.com/pub/openldap/%SUBDIR%/ \
-			ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.matrix.com.br/pub/openldap/%SUBDIR%/ \
-			ftp://ftp.ucr.ac.cr/pub/Unix/openldap/%SUBDIR%/ \
-			ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.shellhung.org/pub/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.u-aizu.ac.jp/pub/net/openldap/%SUBDIR%/ \
-			ftp://ftp.holywar.net/pub/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.nl.uu.net/pub/unix/db/openldap/%SUBDIR%/ \
-			ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.rediris.es/mirror/OpenLDAP/%SUBDIR%/ \
-			ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
-			http://openldap.cdpa.nsysu.edu.tw/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.plig.org/pub/OpenLDAP/%SUBDIR%/
-MASTER_SITE_SUBDIR=	openldap-release
-PKGNAMESUFFIX=		${OPENLDAP_PKGNAMESUFFIX}
-EXTRACT_SUFX=		.tgz
-
-MAINTAINER=		eik@FreeBSD.org
-COMMENT?=		Open source LDAP server implementation
-
-LATEST_LINK=		${PKGNAMEPREFIX}openldap22${PKGNAMESUFFIX}
-
-WANT_OPENLDAP_VER?=	22
-.if ${WANT_OPENLDAP_VER} != 22
-BROKEN=			"incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}"
-.endif
-
-PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
-
-PKGNAMESUFFIX_CLIENT=	-client
-PKGNAMESUFFIX_SERVER=	-server
-
-.if defined(CLIENT_ONLY)
-OPENLDAP_PORTREVISION=	${PORTREVISION_CLIENT}
-OPENLDAP_PKGNAMESUFFIX=	${PKGNAMESUFFIX_CLIENT}
-OPENLDAP_PKGFILESUFX=	.client
-
-CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[013-9].* \
-			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[013-9].*
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=		drafts rfc
-.endif
-
-.if defined(USE_OPENLDAP)
-.error You have `USE_OPENLDAP' defined either in your environment or in make(1) arguments.
-.endif
-.else
-OPENLDAP_PORTREVISION=	${PORTREVISION_SERVER}
-OPENLDAP_PKGNAMESUFFIX=	${PKGNAMESUFFIX_SERVER}
-OPENLDAP_PKGFILESUFX=
-
-RUN_DEPENDS=		${LOCALBASE}/lib/libldap.so.202:${PORTSDIR}/net/openldap22-client
-#RUN_DEPENDS=		${LOCALBASE}/lib/libldap-2.2.so.7:${PORTSDIR}/net/openldap22-client
-CONFLICTS+=		${PKGNAMEPREFIX}${PORTNAME}-server-2.[013-9].* \
-			${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.[013-9].*
-
-.if ${PORTREVISION_CLIENT} != 0
-SUF1_CLIENT=		_${PORTREVISION_CLIENT}
-.endif
-
-PKGNAME_CLIENT=		${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX_CLIENT}-${PORTVERSION}${SUF1_CLIENT}
-.endif
-
-USE_OPENSSL=		yes
-USE_REINPLACE=		yes
-GNU_CONFIGURE=		yes
-
-DESCR=			${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
-PLIST=			${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
-PKGINSTALL=		${WRKDIR}/pkg-install
-PKGMESSAGE=		${WRKDIR}/pkg-message
-PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
-
-SCHEMATA=		corba core cosine \
-			dyngroup inetorgperson java \
-			misc nis openldap
-
-LDAP_RUN_DIR?=		${DESTDIR}/var/run/openldap
-LOCALSTATEDIR?=		${DESTDIR}/var/db
-DATABASEDIR?=		${LOCALSTATEDIR}/openldap-data
-SLURPDIR?=		${LOCALSTATEDIR}/openldap-slurp
-
-PLIST_SUB+=		LDAP_RUN_DIR=${LDAP_RUN_DIR} \
-			DATABASEDIR=${DATABASEDIR} \
-			SLURPDIR=${SLURPDIR} \
-
-SED_SCRIPT=		-e 's,%%PKGNAME%%,${PKGNAME},g' \
-			-e 's,%%PREFIX%%,${PREFIX},g' \
-			-e 's,%%LDAP_RUN_DIR%%,${LDAP_RUN_DIR},g' \
-			-e 's,%%DATABASEDIR%%,${DATABASEDIR},g' \
-			-e 's,%%SLURPDIR%%,${SLURPDIR},g'
-
-CONFIGURE_ARGS=		--with-threads=posix \
-			--with-tls=openssl \
-			--enable-dynamic
-
-.if defined(WITH_SASL)
-PKGNAMESUFFIX_CLIENT:=	-sasl${PKGNAMESUFFIX_CLIENT}
-PKGNAMESUFFIX_SERVER:=	-sasl${PKGNAMESUFFIX_SERVER}
-LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-CONFIGURE_ARGS+=	--with-cyrus-sasl
-.else
-CONFIGURE_ARGS+=	--without-cyrus-sasl
-.endif
-
-.if defined(CLIENT_ONLY)
-# client specific configuration
-
-CONFIGURE_ARGS+=	--disable-slapd
-
-INSTALLS_SHLIB=		yes
-
-.else
-# server specific configuration
-
-USE_RC_SUBR=		yes
-
-SED_SCRIPT+=		-e 's,%%PKGNAME_CLIENT%%,${PKGNAME_CLIENT},g' \
-			-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-			-e 's,%%RC_DIR%%,${RC_DIR},g' \
-			-e 's,%%RC_SUFX%%,${RC_SUFX},g'
-PLIST_SUB+=		RC_DIR=${RC_DIR} \
-			RC_SUFX=${RC_SUFX}
-
-EXTRA_PATCHES+=		${FILESDIR}/extrapatch-Makefile.in
-
-CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
-			--enable-ldbm \
-			--enable-crypt \
-			--enable-lmpasswd \
-			--enable-ldap \
-			--enable-meta \
-			--enable-rewrite \
-			--enable-null \
-			--enable-monitor
-
-.if defined(WITHOUT_BDB)
-CONFIGURE_ARGS+=	--with-ldbm-api=bcompat \
-			--disable-bdb
-.else
-WITH_BDB_VER?=		42
-
-.if ${WITH_BDB_VER} == 42
-CONFIGURE_ARGS+=	--enable-bdb
-BDBLIB=			db-4.2.2
-.elif ${WITH_BDB_VER} == 41
-CONFIGURE_ARGS+=	--disable-bdb
-BDBLIB=			db41.1
-.elif ${WITH_BDB_VER} == 4
-CONFIGURE_ARGS+=	--disable-bdb
-BDBLIB=			db4.0
-.elif ${WITH_BDB_VER} == 3
-CONFIGURE_ARGS+=	--disable-bdb
-BDBLIB=			db3.3
-.else
-.error WITH_BDB_VER must be 3, 4, 41 or 42
-.endif
-
-LIB_DEPENDS+=		${BDBLIB}:${PORTSDIR}/databases/db${WITH_BDB_VER}
-CPPFLAGS+=		-I${LOCALBASE}/include/db${WITH_BDB_VER}
-CONFIGURE_ARGS+=	--with-ldbm-api=berkeley \
-			--enable-hdb
-CONFIGURE_SED+=		-e 's,ol_DB_LIB=$$,&-l${BDBLIB:R},' \
-			-e 's,(ol_cv_lib_db=)yes$$,\1-l${BDBLIB:R},'
-.endif
-
-.if defined(WITH_SHELL)
-CONFIGURE_ARGS+=	--enable-shell
-.endif
-
-.if defined(WITH_PERL)
-USE_PERL5=	yes
-CONFIGURE_ARGS+=	--enable-perl
-.endif
-
-.if defined(WITH_SASL)
-CONFIGURE_ARGS+=	--enable-spasswd
-.endif
-
-.if defined(WITH_ODBC)
-WITH_ODBC_TYPE?=	iODBC
-.endif
-.if defined(WITH_ODBC_TYPE)
-CONFIGURE_ARGS+=	--enable-sql
-.if ${WITH_ODBC_TYPE:L} == iodbc
-LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
-.elif ${WITH_ODBC_TYPE:L} == unixodbc
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
-.else
-.error WITH_ODBC_TYPE must be iODBC or unixODBC
-.endif
-.endif
-
-.if defined(WITH_SLAPI)
-LIB_DEPENDS+=		ltdl.4:${PORTSDIR}/devel/libltdl
-CONFIGURE_ARGS+=	--enable-slapi \
-			--enable-modules
-PLIST_SUB+=		SLAPI=""
-INSTALLS_SHLIB=		yes
-.else
-PLIST_SUB+=		SLAPI="@comment "
-.endif
-
-# Include tcp-wrapper support
-.if !defined(WITHOUT_TCP_WRAPPERS) && exists(/usr/include/tcpd.h)
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
-
-# end of client/server specific configuration
-.endif
-
-CPPFLAGS+=		${PTHREAD_CFLAGS} \
-			-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
-#LIBS+=			${PTHREAD_LIBS}
-
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			LIBS="${LIBS}"
-
-.include <bsd.port.pre.mk>
-
-.if defined(CLIENT_ONLY)
-.include "${FILESDIR}/manpages"
-.else
-.if ${OSVERSION} >= 500038
-RC_DIR=		${DESTDIR}/etc/rc.d
-RC_SUFX=
-.else
-RC_DIR=		${PREFIX}/etc/rc.d
-RC_SUFX=	.sh
-.endif
-.endif
-
-pre-everything::
-	@${ECHO} "============================================================="
-	@${ECHO}
-	@${ECHO} "You can build ${PKGNAME} with the following options:"
-	@${ECHO}
-.if defined(CLIENT_ONLY)
-	@${ECHO} "WITH_SASL             with (Cyrus) SASL2 support"
-.else
-	@${ECHO} "WITH_BDB_VER          select BerkeleyDB version (default 42)"
-	@${ECHO} "WITH_SASL             with (Cyrus) SASL2 password verification"
-	@${ECHO} "WITH_PERL             with Perl backend"
-	@${ECHO} "WITH_SHELL            with Shell backend"
-	@${ECHO} "WITH_ODBC             with SQL backend"
-	@${ECHO} "WITH_ODBC_TYPE        select ODBC interface (iODBC or unixODBC)"
-	@${ECHO} "WITH_SLAPI            with Netscape SLAPI plugin API
-	@${ECHO} "WITHOUT_TCP_WRAPPERS  without tcp wrapper support"
-	@${ECHO} "WITHOUT_BDB           without BerkeleyDB support"
-.endif
-	@${ECHO}
-	@${ECHO} "============================================================="
-	@${ECHO}
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,%LOCALSTATEDIR%/run/,${LDAP_RUN_DIR}/,g' \
-		${WRKSRC}/servers/slapd/slapd.conf
-.if defined(CONFIGURE_SED)
-	@${REINPLACE_CMD} -E ${CONFIGURE_SED} \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.endif
-
-pre-configure:
-	@if [ -n "`${PKG_INFO} -xI '^bind\(84\)\{0,1\}-base-8\.' 2>/dev/null`" ]; then \
-		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
-		${FALSE}; \
-	fi
-
-post-build:
-.for script in slapd slurpd
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/${script}.sh >${WRKDIR}/${script}.sh
-.endfor
-.for text in pkg-install pkg-message pkg-deinstall
-	@if [ -f ${PKGDIR}/${text}${OPENLDAP_PKGFILESUFX} ]; then \
-		${SED} ${SED_SCRIPT} ${PKGDIR}/${text}${OPENLDAP_PKGFILESUFX} \
-		>${WRKDIR}/${text}; \
-	fi
-.endfor
-
-.if !defined(CLIENT_ONLY)
-test: build
-	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
-		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
-.endif
-
-pre-install:
-	@if [ -f ${PKGINSTALL} ]; then \
-		${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL; \
-	fi
-
-post-install:
-.if defined(CLIENT_ONLY)
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@for dir in drafts rfc; do \
-		${MKDIR} ${DOCSDIR}/$${dir}; \
-		${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${DOCSDIR}/$${dir}; \
-	done
-.endif
-.else
-	@for schema in ${SCHEMATA}; do \
-		${ECHO_CMD} "@unexec if cmp -s %D/etc/openldap/schema/$${schema}.schema" \
-			"%D/etc/openldap/schema/$${schema}.schema.default; then" \
-			"rm -f %D/etc/openldap/schema/$${schema}.schema; fi" >>${TMPPLIST}; \
-		${ECHO_CMD} "etc/openldap/schema/$${schema}.schema.default" >>${TMPPLIST}; \
-		${ECHO_CMD} "@exec [ -f %B/$${schema}.schema ] || cp %B/%f %B/$${schema}.schema" >>${TMPPLIST}; \
-	done
-	@${ECHO_CMD} "@unexec rmdir %D/etc/openldap/schema 2>/dev/null || true" >>${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/etc/openldap 2>/dev/null || true" >>${TMPPLIST}
-#	currently the only way to participate in rcorder(8)
-	@if [ "${RC_DIR}" != "${PREFIX}" ]; then \
-		${ECHO_CMD} "@cwd ${RC_DIR}" >>${TMPPLIST}; \
-	fi
-.for script in slapd slurpd
-	@${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${RC_DIR}/${script}${RC_SUFX}
-	@${ECHO_CMD} "${script}${RC_SUFX}" >>${TMPPLIST}
-.endfor
-	@${MKDIR} ${LDAP_RUN_DIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
deleted file mode 100644
index c62d2c991478..000000000000
--- a/net/openldap24-server/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (openldap-2.2.10.tgz) = 3620465b331626308463a7651e4fb9c6
-SIZE (openldap-2.2.10.tgz) = 2558755
diff --git a/net/openldap24-server/files/extrapatch-Makefile.in b/net/openldap24-server/files/extrapatch-Makefile.in
deleted file mode 100644
index bb83ea2b572a..000000000000
--- a/net/openldap24-server/files/extrapatch-Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.in.orig	Mon Apr  7 22:23:24 2003
-+++ Makefile.in	Thu Jul 10 17:43:35 2003
-@@ -10,9 +10,11 @@
- ## in file LICENSE in the top-level directory of the distribution.
- ##
- 
--SUBDIRS= include libraries clients servers tests doc
--CLEANDIRS=
--INSTALLDIRS= 
-+SUBDIRS=
-+ALLDIRS= include libraries clients servers tests doc
-+CLEANDIRS= include libraries clients servers tests doc
-+DEPENDDIRS= include libraries clients servers tests doc
-+INSTALLDIRS=  servers
- 
- makefiles:	FORCE
- 	./config.status
diff --git a/net/openldap24-server/files/manpages b/net/openldap24-server/files/manpages
deleted file mode 100644
index bf7071542349..000000000000
--- a/net/openldap24-server/files/manpages
+++ /dev/null
@@ -1,194 +0,0 @@
-#
-# $FreeBSD$
-#
-
-MAN1+=	ldapcompare.1 \
-	ldapdelete.1 \
-	ldapmodify.1 \
-	ldapmodrdn.1 \
-	ldappasswd.1 \
-	ldapsearch.1 \
-	ldapwhoami.1
-MLINKS+= \
-	ldapmodify.1 ldapadd.1
-
-MAN3+=	lber-decode.3 \
-	lber-encode.3 \
-	lber-memory.3 \
-	lber-types.3 \
-	ldap.3 \
-	ldap_abandon.3 \
-	ldap_add.3 \
-	ldap_bind.3 \
-	ldap_compare.3 \
-	ldap_delete.3 \
-	ldap_error.3 \
-	ldap_first_attribute.3 \
-	ldap_first_entry.3 \
-	ldap_first_message.3 \
-	ldap_first_reference.3 \
-	ldap_get_dn.3 \
-	ldap_get_values.3 \
-	ldap_modify.3 \
-	ldap_modrdn.3 \
-	ldap_open.3 \
-	ldap_parse_reference.3 \
-	ldap_parse_result.3 \
-	ldap_result.3 \
-	ldap_schema.3 \
-	ldap_search.3 \
-	ldap_sort.3 \
-	ldap_url.3
-MLINKS+= \
-	lber-decode.3 ber_first_element.3 \
-	lber-decode.3 ber_get_bitstring.3 \
-	lber-decode.3 ber_get_boolean.3 \
-	lber-decode.3 ber_get_enum.3 \
-	lber-decode.3 ber_get_int.3 \
-	lber-decode.3 ber_get_next.3 \
-	lber-decode.3 ber_get_null.3 \
-	lber-decode.3 ber_get_stringa.3 \
-	lber-decode.3 ber_get_stringb.3 \
-	lber-decode.3 ber_next_element.3 \
-	lber-decode.3 ber_peek_tag.3 \
-	lber-decode.3 ber_scanf.3 \
-	lber-decode.3 ber_skip_tag.3 \
-	lber-encode.3 ber_alloc_t.3 \
-	lber-encode.3 ber_flush.3 \
-	lber-encode.3 ber_printf.3 \
-	lber-encode.3 ber_put_enum.3 \
-	lber-encode.3 ber_put_int.3 \
-	lber-encode.3 ber_put_null.3 \
-	lber-encode.3 ber_put_ostring.3 \
-	lber-encode.3 ber_put_seq.3 \
-	lber-encode.3 ber_put_set.3 \
-	lber-encode.3 ber_put_string.3 \
-	lber-encode.3 ber_start_set.3 \
-	lber-types.3 ber_bvarray_add.3 \
-	lber-types.3 ber_bvarray_free.3 \
-	lber-types.3 ber_bvdup.3 \
-	lber-types.3 ber_bvecadd.3 \
-	lber-types.3 ber_bvecfree.3 \
-	lber-types.3 ber_bvfree.3 \
-	lber-types.3 ber_bvstr.3 \
-	lber-types.3 ber_bvstrdup.3 \
-	lber-types.3 ber_dupbv.3 \
-	lber-types.3 ber_free.3 \
-	lber-types.3 ber_str2bv.3 \
-	ldap_abandon.3 ldap_abandon_ext.3 \
-	ldap_add.3 ldap_add_ext.3 \
-	ldap_add.3 ldap_add_ext_s.3 \
-	ldap_add.3 ldap_add_s.3 \
-	ldap_bind.3 ldap_bind_s.3 \
-	ldap_bind.3 ldap_kerberos_bind1.3 \
-	ldap_bind.3 ldap_kerberos_bind1_s.3 \
-	ldap_bind.3 ldap_kerberos_bind2.3 \
-	ldap_bind.3 ldap_kerberos_bind2_s.3 \
-	ldap_bind.3 ldap_kerberos_bind_s.3 \
-	ldap_bind.3 ldap_sasl_bind.3 \
-	ldap_bind.3 ldap_sasl_bind_s.3 \
-	ldap_bind.3 ldap_simple_bind.3 \
-	ldap_bind.3 ldap_simple_bind_s.3 \
-	ldap_bind.3 ldap_unbind.3 \
-	ldap_bind.3 ldap_unbind_ext.3 \
-	ldap_bind.3 ldap_unbind_ext_s.3 \
-	ldap_bind.3 ldap_unbind_s.3 \
-	ldap_compare.3 ldap_compare_ext.3 \
-	ldap_compare.3 ldap_compare_ext_s.3 \
-	ldap_compare.3 ldap_compare_s.3 \
-	ldap_delete.3 ldap_delete_ext.3 \
-	ldap_delete.3 ldap_delete_ext_s.3 \
-	ldap_delete.3 ldap_delete_s.3 \
-	ldap_error.3 ld_errno.3 \
-	ldap_error.3 ldap_err2string.3 \
-	ldap_error.3 ldap_errlist.3 \
-	ldap_error.3 ldap_perror.3 \
-	ldap_error.3 ldap_result2error.3 \
-	ldap_first_attribute.3 ldap_next_attribute.3 \
-	ldap_first_entry.3 ldap_count_entries.3 \
-	ldap_first_entry.3 ldap_next_entry.3 \
-	ldap_first_message.3 ldap_count_messages.3 \
-	ldap_first_message.3 ldap_next_message.3 \
-	ldap_first_reference.3 ldap_count_references.3 \
-	ldap_first_reference.3 ldap_next_reference.3 \
-	ldap_get_dn.3 ldap_dcedn2dn.3 \
-	ldap_get_dn.3 ldap_dn2ad_canonical.3 \
-	ldap_get_dn.3 ldap_dn2dcedn.3 \
-	ldap_get_dn.3 ldap_dn2str.3 \
-	ldap_get_dn.3 ldap_dn2ufn.3 \
-	ldap_get_dn.3 ldap_explode_dn.3 \
-	ldap_get_dn.3 ldap_explode_rdn.3 \
-	ldap_get_dn.3 ldap_str2dn.3 \
-	ldap_get_values.3 ldap_count_values.3 \
-	ldap_get_values.3 ldap_count_values_len.3 \
-	ldap_get_values.3 ldap_get_values_len.3 \
-	ldap_get_values.3 ldap_value_free.3 \
-	ldap_get_values.3 ldap_value_free_len.3 \
-	ldap_modify.3 ldap_modify_ext.3 \
-	ldap_modify.3 ldap_modify_ext_s.3 \
-	ldap_modify.3 ldap_modify_s.3 \
-	ldap_modify.3 ldap_mods_free.3 \
-	ldap_modrdn.3 ldap_modrdn2.3 \
-	ldap_modrdn.3 ldap_modrdn2_s.3 \
-	ldap_modrdn.3 ldap_modrdn_s.3 \
-	ldap_open.3 ldap_init.3 \
-	ldap_parse_result.3 ldap_parse_extended_result.3 \
-	ldap_parse_result.3 ldap_parse_sasl_bind_result.3 \
-	ldap_result.3 ldap_msgfree.3 \
-	ldap_result.3 ldap_msgid.3 \
-	ldap_result.3 ldap_msgtype.3 \
-	ldap_schema.3 ldap_attributetype2name.3 \
-	ldap_schema.3 ldap_attributetype2str.3 \
-	ldap_schema.3 ldap_attributetype_free.3 \
-	ldap_schema.3 ldap_matchingrule2name.3 \
-	ldap_schema.3 ldap_matchingrule2str.3 \
-	ldap_schema.3 ldap_matchingrule_free.3 \
-	ldap_schema.3 ldap_objectclass2name.3 \
-	ldap_schema.3 ldap_objectclass2str.3 \
-	ldap_schema.3 ldap_objectclass_free.3 \
-	ldap_schema.3 ldap_scherr2str.3 \
-	ldap_schema.3 ldap_str2attributetype.3 \
-	ldap_schema.3 ldap_str2matchingrule.3 \
-	ldap_schema.3 ldap_str2objectclass.3 \
-	ldap_schema.3 ldap_str2syntax.3 \
-	ldap_schema.3 ldap_syntax2name.3 \
-	ldap_schema.3 ldap_syntax2str.3 \
-	ldap_schema.3 ldap_syntax_free.3 \
-	ldap_search.3 ldap_search_ext.3 \
-	ldap_search.3 ldap_search_ext_s.3 \
-	ldap_search.3 ldap_search_s.3 \
-	ldap_search.3 ldap_search_st.3 \
-	ldap_sort.3 ldap_sort_entries.3 \
-	ldap_sort.3 ldap_sort_strcasecmp.3 \
-	ldap_sort.3 ldap_sort_values.3 \
-	ldap_url.3 ldap_free_urldesc.3 \
-	ldap_url.3 ldap_is_ldap_url.3 \
-	ldap_url.3 ldap_url_parse.3
-
-MAN5+=	ldap.conf.5 \
-	ldif.5 \
-	slapd-bdb.5 \
-	slapd-dnssrv.5 \
-	slapd-ldap.5 \
-	slapd-ldbm.5 \
-	slapd-meta.5 \
-	slapd-monitor.5 \
-	slapd-null.5 \
-	slapd-passwd.5 \
-	slapd-perl.5 \
-	slapd-shell.5 \
-	slapd-sql.5 \
-	slapd-tcl.5 \
-	slapd.access.5 \
-	slapd.conf.5 \
-	slapd.plugin.5 \
-	slapd.replog.5
-
-MAN8+=	slapadd.8 \
-	slapcat.8 \
-	slapd.8 \
-	slapdn.8 \
-	slapindex.8 \
-	slappasswd.8 \
-	slaptest.8 \
-	slurpd.8
diff --git a/net/openldap24-server/files/patch-build::ltmain.sh b/net/openldap24-server/files/patch-build::ltmain.sh
deleted file mode 100644
index 515dd96d8756..000000000000
--- a/net/openldap24-server/files/patch-build::ltmain.sh
+++ /dev/null
@@ -1,46 +0,0 @@
---- build/ltmain.sh.orig	Thu Jan  1 19:16:25 2004
-+++ build/ltmain.sh	Sun Mar 28 14:58:06 2004
-@@ -1076,7 +1076,7 @@
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -1088,6 +1088,12 @@
- 
-       -module)
- 	module=yes
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not build the useless static library
-+	  build_old_libs=no
-+	  ;;
-+	esac
- 	continue
- 	;;
- 
-@@ -4296,10 +4302,17 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
--	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--	instname="$dir/$name"i
--	$show "$install_prog $instname $destdir/$name"
--	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not install the useless pseudo-library
-+	  ;;
-+	*)
-+	  name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	  instname="$dir/$name"i
-+	  $show "$install_prog $instname $destdir/$name"
-+	  $run eval "$install_prog $instname $destdir/$name" || exit $?
-+	  ;;
-+	esac
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net/openldap24-server/files/patch-build::top.mk b/net/openldap24-server/files/patch-build::top.mk
deleted file mode 100644
index b6ec9f5e1657..000000000000
--- a/net/openldap24-server/files/patch-build::top.mk
+++ /dev/null
@@ -1,20 +0,0 @@
---- build/top.mk.orig	Wed Mar 24 22:51:22 2004
-+++ build/top.mk	Wed Mar 31 22:28:53 2004
-@@ -69,7 +69,7 @@
- LIBTOOL = @LIBTOOL@
- LIBRELEASE = @OPENLDAP_LIBRELEASE@
- LIBVERSION = @OPENLDAP_LIBVERSION@
--LTVERSION = -release $(LIBRELEASE) -version-info $(LIBVERSION)
-+LTVERSION = -version-info $(LIBVERSION)
- 
- # libtool --only flag for libraries: platform specific
- NT_LTONLY_LIB = # --only-$(BUILD_LIBS_DYNAMIC)
-@@ -191,6 +191,8 @@
- 
- SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@
- SLURPD_LIBS = @SLURPD_LIBS@
-+
-+SLAPI_LIBS = @SLAPI_LIBS@
- 
- # Our Defaults
- CC = $(AC_CC)
diff --git a/net/openldap24-server/files/patch-build::version.var b/net/openldap24-server/files/patch-build::version.var
deleted file mode 100644
index 0a60e601f13a..000000000000
--- a/net/openldap24-server/files/patch-build::version.var
+++ /dev/null
@@ -1,13 +0,0 @@
---- build/version.var.orig	Fri Apr 16 17:34:39 2004
-+++ build/version.var	Fri Apr 16 22:56:05 2004
-@@ -17,7 +17,7 @@
- ol_minor=2
- ol_patch=10
- ol_api_inc=20210
--ol_api_current=7
--ol_api_revision=3
--ol_api_age=0
-+ol_api_current=202
-+ol_api_revision=2
-+ol_api_age=200
- ol_release_date="2004/04/16"
diff --git a/net/openldap24-server/files/patch-servers::slapd::Makefile.in b/net/openldap24-server/files/patch-servers::slapd::Makefile.in
deleted file mode 100644
index c55fcd9b7c59..000000000000
--- a/net/openldap24-server/files/patch-servers::slapd::Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- servers/slapd/Makefile.in.orig	Mon Dec 29 19:10:38 2003
-+++ servers/slapd/Makefile.in	Tue Jan 20 02:33:39 2004
-@@ -343,7 +343,6 @@
- 
- install-slapd: FORCE
- 	-$(MKDIR) $(DESTDIR)$(libexecdir)
--	-$(MKDIR) $(DESTDIR)$(localstatedir)/run
- 	$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
- 		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
- 	@for i in $(SUBDIRS); do \
diff --git a/net/openldap24-server/files/slapd.sh b/net/openldap24-server/files/slapd.sh
deleted file mode 100644
index fb77d4374fd0..000000000000
--- a/net/openldap24-server/files/slapd.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: slapd
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable slapd:
-#
-#slapd_enable="YES"
-#slapd_flags='-h "ldapi://%2fvar%2frun%2fopenldap%2fldapi/ ldap://0.0.0.0/"'
-#slapd_sockets="/var/run/openldap/ldapi"
-#
-# See slapd(8) for more flags
-#
-# The `-u' and `-g' flags are automatically extracted from slapd_owner,
-# by default slapd runs under the non-privileged user id `ldap'. If you
-# want to run slapd as root, override this in /etc/rc.conf with
-#
-#slapd_owner="DEFAULT"
-#
-
-. %%RC_SUBR%%
-
-name=slapd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/libexec/slapd
-pidfile=%%LDAP_RUN_DIR%%/slapd.pid
-required_dirs=%%LDAP_RUN_DIR%%
-required_files=%%PREFIX%%/etc/openldap/slapd.conf
-
-start_precmd=start_precmd
-start_postcmd=start_postcmd
-
-# extract user and group, adjust ownership of directories and database
-
-start_precmd()
-{
-  case x"$slapd_owner" in
-  x|x[Nn][Oo][Nn][Ee]|x[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
-    ;;
-  x*)
-    chown "$slapd_owner" "%%LDAP_RUN_DIR%%"
-    chown -RL "$slapd_owner" "%%DATABASEDIR%%"
-    chown "$slapd_owner" "%%PREFIX%%/etc/openldap/slapd.conf"
-
-    slapd_ownername=`expr //"$slapd_owner" : //'\([^:]*\)'`
-    slapd_groupname=`expr //"$slapd_owner" : //'.*:\([^:]*\)'`
-
-    if [ -n "$slapd_ownername" ]; then
-      rc_flags="$rc_flags -u $slapd_ownername"
-    fi
-    if [ -n "$slapd_groupname" ]; then
-      rc_flags="$rc_flags -g $slapd_groupname"
-    fi
-    ;;
-  esac
-}
-
-# adjust ownership of created unix sockets
-
-start_postcmd()
-{
-  for socket in $slapd_sockets; do
-    for seconds in 1 2 3 4 5; do
-      [ -e "$socket" ] && break
-      sleep 1
-    done
-    if [ -S "$socket" ]; then
-      case x"$slapd_owner" in
-      x|x[Nn][Oo][Nn][Ee]|x[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
-        ;;
-      x*)
-        chown "$slapd_owner" "$socket"
-        ;;
-      esac
-      chmod "$slapd_sockets_mode" "$socket"
-    fi
-  done
-}
-
-# set defaults
-
-[ -z "$slapd_enable" ]       && slapd_enable=NO
-[ -z "$slapd_flags" ]        && slapd_flags=
-
-[ -z "$slapd_owner" ]        && slapd_owner=ldap:ldap
-[ -z "$slapd_sockets" ]      && slapd_sockets=
-[ -z "$slapd_sockets_mode" ] && slapd_sockets_mode=666
-
-load_rc_config $name
-
-if [ -n "$slapd_args" ]; then
-  warn "slapd_args is deprecated, use slapd_flags"
-  slapd_flags="$slapd_args"
-fi
-
-run_rc_command "$1"
diff --git a/net/openldap24-server/files/slurpd.sh b/net/openldap24-server/files/slurpd.sh
deleted file mode 100644
index 558f58c1f592..000000000000
--- a/net/openldap24-server/files/slurpd.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: slurpd
-# REQUIRE: slapd
-# BEFORE:
-# KEYWORD: FreeBSD shutdown
-
-# Add the following line to /etc/rc.conf to enable slurpd:
-#
-#slurpd_enable="YES"
-#
-# See slurpd(8) for more flags
-#
-
-. %%RC_SUBR%%
-
-name=slurpd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/libexec/slurpd
-required_files=%%PREFIX%%/etc/openldap/slapd.conf
-
-[ -z "$slurpd_enable" ] && slurpd_enable="NO"
-[ -z "$slurpd_flags" ]  && slurpd_flags=
-
-load_rc_config $name
-
-if [ -n "$slurpd_args" ]; then
-  warn "slurpd_args is deprecated, use slurpd_flags"
-  slurpd_flags="$slurpd_args"
-fi
-
-run_rc_command "$1"
diff --git a/net/openldap24-server/pkg-deinstall b/net/openldap24-server/pkg-deinstall
deleted file mode 100644
index 2a5ec1ef8f65..000000000000
--- a/net/openldap24-server/pkg-deinstall
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-ECHO_CMD=echo
-
-case $2 in
-POST-DEINSTALL)
-  ${ECHO_CMD}
-  ${ECHO_CMD} "The OpenLDAP server package has been deleted."
-  ${ECHO_CMD} "If you're *not* upgrading and won't be using"
-  ${ECHO_CMD} "it any longer, you may want to issue the"
-  ${ECHO_CMD} "following commands:"
-  ${ECHO_CMD}
-  if [ -d %%DATABASEDIR%% ]; then
-    ${ECHO_CMD} "- to delete the OpenLDAP database permanently (losing all data):"
-    ${ECHO_CMD} "  rm -Rf %%DATABASEDIR%%"
-    ${ECHO_CMD}
-  fi
-  if [ -d %%SLURPDIR%% ]; then
-    ${ECHO_CMD} "- to remove the OpenLDAP replication directory:"
-    ${ECHO_CMD} "  rm -Rf %%SLURPDIR%%"
-    ${ECHO_CMD}
-  fi
-  ${ECHO_CMD} "- to remove the OpenLDAP user:"
-  ${ECHO_CMD} "  pw userdel ldap"
-  ${ECHO_CMD}
-  ${ECHO_CMD} "If you are upgrading, don't forget to restart"
-  ${ECHO_CMD} "slapd and slurpd."
-  ${ECHO_CMD}
-  ;;
-esac
diff --git a/net/openldap24-server/pkg-descr b/net/openldap24-server/pkg-descr
deleted file mode 100644
index 509e40a2462f..000000000000
--- a/net/openldap24-server/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-OpenLDAP is a suite of Lightweight Directory Access Protocol (v3) servers,
-clients, utilities and development tools.
-
-This package includes the following major components:
-
- * slapd - a stand-alone LDAP directory server
- * slurpd - a stand-alone LDAP replication server
- * LDIF tools - data conversion tools for use with slapd
-
-This is the latest release of OpenLDAP Software for general use.
-
-WWW: http://www.OpenLDAP.org/
-
-- Oliver Eikemeier
-eikemeier@fillmore-labs.com
diff --git a/net/openldap24-server/pkg-descr.client b/net/openldap24-server/pkg-descr.client
deleted file mode 100644
index 7e508c450d4a..000000000000
--- a/net/openldap24-server/pkg-descr.client
+++ /dev/null
@@ -1,16 +0,0 @@
-OpenLDAP is a suite of Lightweight Directory Access Protocol (v3) servers,
-clients, utilities and development tools.
-
-This package includes the following major components:
-
- * -lldap - a LDAP client library
- * -llber - a lightweight BER/DER encoding/decoding library
- * LDAP tools - A collection of command line LDAP utilities
- * documentation - man pages for all components
-
-This is the latest release of OpenLDAP Software for general use.
-
-WWW: http://www.OpenLDAP.org/
-
-- Oliver Eikemeier
-eikemeier@fillmore-labs.com
diff --git a/net/openldap24-server/pkg-install b/net/openldap24-server/pkg-install
deleted file mode 100644
index 593e92c14a5e..000000000000
--- a/net/openldap24-server/pkg-install
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-CHOWN=/usr/sbin/chown
-ECHO_CMD=echo
-GREP=/usr/bin/grep
-PKG_INFO=/usr/sbin/pkg_info
-PW=/usr/sbin/pw
-
-FTPUSERS=/etc/ftpusers
-
-case $2 in
-PRE-INSTALL)
-  if ! ${PKG_INFO} -e '%%PKGNAME_CLIENT%%'; then
-    ${ECHO_CMD} "===>  %%PKGNAME%% requires %%PKGNAME_CLIENT%%."
-    ${ECHO_CMD}
-    ${ECHO_CMD} "      Please install %%PKGNAME_CLIENT%% manually."
-    exit 1
-  fi
-  if ! ${PW} usershow -n ldap >/dev/null 2>&1; then
-    ${ECHO_CMD}
-    if ! ${PW} groupshow -n ldap >/dev/null 2>&1; then
-      if ! ${PW} groupadd -n ldap -g 389; then
-        ${ECHO_CMD} "*** Failed to add a group ldap with id 389."
-        ${ECHO_CMD}
-        ${ECHO_CMD} "Please add the ldap user manually with"
-        ${ECHO_CMD} "  ${PW} useradd -n ldap -g ldap -c 'OpenLDAP server' \\"
-        ${ECHO_CMD} "  -d /nonexistent -s /sbin/nologin -h -"        
-        ${ECHO_CMD} "and retry installing this package."
-        exit 1
-      fi
-      ${ECHO_CMD} "===>  Group 'ldap' created."
-    fi
-    if ! ${PW} useradd -n ldap -u 389 -g ldap -c 'OpenLDAP Server' \
-        -d /nonexistent -s /sbin/nologin -h -; then
-      ${ECHO_CMD} "*** Failed to add an user ldap with id 389."
-      ${ECHO_CMD}
-      ${ECHO_CMD} "Please add the ldap user manually with"
-      ${ECHO_CMD} "  ${PW} useradd -n ldap -g ldap -c 'OpenLDAP server' \\"
-      ${ECHO_CMD} "  -d /nonexistent -s /sbin/nologin -h -"        
-      ${ECHO_CMD} "and retry installing this package."
-      exit 1
-    fi
-    ${GREP} -qs '^ldap$' ${FTPUSERS} || ${ECHO_CMD} ldap >> ${FTPUSERS}
-    ${ECHO_CMD} "===>  Account 'ldap' created."
-  fi
-  ;;
-esac
diff --git a/net/openldap24-server/pkg-message b/net/openldap24-server/pkg-message
deleted file mode 100644
index 2317ce44f955..000000000000
--- a/net/openldap24-server/pkg-message
+++ /dev/null
@@ -1,28 +0,0 @@
-************************************************************
-
-The OpenLDAP server package has been successfully installed.
-
-In order to run the LDAP server, you need to edit
-  %%PREFIX%%/etc/openldap/slapd.conf
-to suit your needs and add the following lines to /etc/rc.conf:
-  slapd_enable="YES"
-  slapd_flags='-h "ldapi://%2fvar%2frun%2fopenldap%2fldapi/ ldap://0.0.0.0/"'
-  slapd_sockets="/var/run/openldap/ldapi"
-
-Then start the server with
-  %%RC_DIR%%/slapd%%RC_SUFX%% start
-or reboot.
-
-Try `man slapd' and the online manual at
-  http://www.OpenLDAP.org/doc/admin22/
-for more information.
-  
-NOTE: Some variable names have been changed to conform with rc.subr(8)
-
-If you are upgrading, you may want to check your configuration with
-  grep ^slapd_ /etc/rc.conf
-
-slapd runs under a non-privileged user id (by default `ldap'),
-see %%RC_DIR%%/slapd%%RC_SUFX%% for more information.
-
-************************************************************
diff --git a/net/openldap24-server/pkg-message.client b/net/openldap24-server/pkg-message.client
deleted file mode 100644
index 92ef70d0f99b..000000000000
--- a/net/openldap24-server/pkg-message.client
+++ /dev/null
@@ -1,13 +0,0 @@
-************************************************************
-
-The OpenLDAP client package has been successfully installed.
-
-Edit
-  %%PREFIX%%/etc/openldap/ldap.conf
-to change the system-wide client defaults.
-
-Try `man ldap.conf' and visit the OpenLDAP FAQ-O-Matic at
-  http://www.OpenLDAP.org/faq/index.cgi?file=3
-for more information.
-
-************************************************************
diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist
deleted file mode 100644
index 8ebdafd53d13..000000000000
--- a/net/openldap24-server/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $FreeBSD$
-@unexec %%RC_DIR%%/slapd%%RC_SUFX%% stop 2>&1 >/dev/null || true
-@unexec %%RC_DIR%%/slurpd%%RC_SUFX%% stop 2>&1 >/dev/null || true
-etc/openldap/schema/README
-@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
-%%SLAPI%%lib/libslapi.a
-%%SLAPI%%lib/libslapi.so
-%%SLAPI%%lib/libslapi.so.202
-@comment %%SLAPI%%lib/libslapi-2.2.so
-@comment %%SLAPI%%lib/libslapi-2.2.so.7
-libexec/slapd
-libexec/slurpd
-sbin/slapadd
-sbin/slapcat
-sbin/slapdn
-sbin/slapindex
-sbin/slappasswd
-sbin/slaptest
-@exec mkdir -p %%LDAP_RUN_DIR%%
-@unexec rmdir %%LDAP_RUN_DIR%% 2>/dev/null || true
-@exec mkdir -p %%DATABASEDIR%%
-@unexec rmdir %%DATABASEDIR%% 2>/dev/null || true
-@exec mkdir -p %%SLURPDIR%%
-@unexec rmdir %%SLURPDIR%% 2>/dev/null || true
diff --git a/net/openldap24-server/pkg-plist.client b/net/openldap24-server/pkg-plist.client
deleted file mode 100644
index dcc079b0ec30..000000000000
--- a/net/openldap24-server/pkg-plist.client
+++ /dev/null
@@ -1,45 +0,0 @@
-@comment $FreeBSD$
-bin/ldapadd
-bin/ldapcompare
-bin/ldapdelete
-bin/ldapmodify
-bin/ldapmodrdn
-bin/ldappasswd
-bin/ldapsearch
-bin/ldapwhoami
-@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 rmdir %D/etc/openldap 2>/dev/null || true
-include/lber.h
-include/lber_types.h
-include/ldap.h
-include/ldap_cdefs.h
-include/ldap_features.h
-include/ldap_schema.h
-include/ldap_utf8.h
-include/slapi-plugin.h
-lib/liblber.a
-lib/liblber.so
-lib/liblber.so.202
-@comment lib/liblber-2.2.so
-@comment lib/liblber-2.2.so.7
-lib/libldap.a
-lib/libldap.so
-lib/libldap.so.202
-@comment lib/libldap-2.2.so
-@comment lib/libldap-2.2.so.7
-lib/libldap_r.a
-lib/libldap_r.so
-lib/libldap_r.so.202
-@comment lib/libldap_r-2.2.so
-@comment lib/libldap_r-2.2.so.7
-share/openldap/ucdata/case.dat
-share/openldap/ucdata/cmbcl.dat
-share/openldap/ucdata/comp.dat
-share/openldap/ucdata/ctype.dat
-share/openldap/ucdata/decomp.dat
-share/openldap/ucdata/kdecomp.dat
-share/openldap/ucdata/num.dat
-@dirrm share/openldap/ucdata
-@dirrm share/openldap
diff --git a/net/openslp/files/slpd.in b/net/openslp/files/slpd.in
deleted file mode 100644
index eb0cb1dc2b34..000000000000
--- a/net/openslp/files/slpd.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# OpenSLP daemon.
-#
-if ! test -x %%PREFIX%%/sbin/slpd
-then
-#	exit 0
-fi
-case $1 in
-start)
-	echo -n ' slpd'
-	%%PREFIX%%/sbin/slpd
-	;;
-stop)
-	killall slpd
-	;;
-*)
-	echo "Usage: $0: [ start | stop ]" 2>&1
-	exit 65
-	;;
-esac
diff --git a/net/p5-IO-Socket-INET6/Makefile b/net/p5-IO-Socket-INET6/Makefile
deleted file mode 100644
index f13351ccb9df..000000000000
--- a/net/p5-IO-Socket-INET6/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for:	p5-IO-INET6
-# Date created:		02 July 2003
-# Whom:	      		Janos.Mohacsi@bsd.hu
-#
-# $FreeBSD$
-#
-
-PORTNAME=	INET6
-PORTVERSION=	2.01
-CATEGORIES=	net perl5 ipv6
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	IO
-PKGNAMEPREFIX=	p5-IO-
-
-MAINTAINER=	janos.mohacsi@bsd.hu
-COMMENT=	Perl module with object interface to AF_INET6 domain sockets
-
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-MAN3=		IO::Socket::INET6.3
-
-PERL_CONFIGURE=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES=	${PATCHDIR}/5.005_03.diff
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/p5-IO-Socket-INET6/distinfo b/net/p5-IO-Socket-INET6/distinfo
deleted file mode 100644
index 845a6f78ee3a..000000000000
--- a/net/p5-IO-Socket-INET6/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (INET6-2.01.tar.gz) = 032a6e50c8c16e400836a9565cdb2f0b
-SIZE (INET6-2.01.tar.gz) = 8628
diff --git a/net/p5-IO-Socket-INET6/files/5.005_03.diff b/net/p5-IO-Socket-INET6/files/5.005_03.diff
deleted file mode 100644
index 03f3cc9ffa4f..000000000000
--- a/net/p5-IO-Socket-INET6/files/5.005_03.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- INET6.pm.orig	Tue Jun 24 14:14:26 2003
-+++ INET6.pm	Wed Jul  2 21:33:28 2003
-@@ -10,7 +10,7 @@
- package IO::Socket::INET6;
- 
- use strict;
--our(@ISA, $VERSION);
-+use vars qw(@ISA $VERSION);
- use IO::Socket;
- use Socket6;
- use Carp;
-@@ -20,7 +20,7 @@
- @ISA = qw(IO::Socket);
- $VERSION = "1.27";
- 
--my $EINVAL = exists(&Errno::EINVAL) ? Errno::EINVAL() : 1;
-+my $EINVAL = defined(&Errno::EINVAL) ? Errno::EINVAL() : 1;
- 
- IO::Socket::INET6->register_domain( AF_INET6 );
- 
-@@ -183,7 +183,7 @@
- 	}
- 
- 	if ($arg->{ReusePort}) {
--	    $sock->sockopt(SO_REUSEPORT,1) or
-+	    $sock->sockopt(0x0200,1) or
- 		    return _error($sock, $!, "$!");
- 	}
- 
diff --git a/net/p5-IO-Socket-INET6/pkg-descr b/net/p5-IO-Socket-INET6/pkg-descr
deleted file mode 100644
index d39177b8d527..000000000000
--- a/net/p5-IO-Socket-INET6/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-IO::Socket::INET6 provides an object interface to creating and using sockets
-in the AF_INET6 domain. It is built upon the IO::Socket interface and
-inherits all the methods defined by IO::Socket. As a consequence, this module 
-is protocol independent, it can run both IPv6 & IPv4, when DNS names are 
-passed.
-
-WWW: http://search.cpan.org/search?dist=IO-INET6
diff --git a/net/p5-IO-Socket-INET6/pkg-plist b/net/p5-IO-Socket-INET6/pkg-plist
deleted file mode 100644
index c55dad737f54..000000000000
--- a/net/p5-IO-Socket-INET6/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%SITE_PERL%%/IO/Socket/INET6.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
diff --git a/net/p5-POE-Component-Client-Ping/Makefile b/net/p5-POE-Component-Client-Ping/Makefile
deleted file mode 100644
index abd275502d1a..000000000000
--- a/net/p5-POE-Component-Client-Ping/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile for:	POE-Component-Client-Ping
-# Date created:		10 Dec 2001
-# Whom:			Sergey Skvortsov <skv@protey.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	POE-Component-Client-Ping
-PORTVERSION=	1.02
-CATEGORIES=	devel perl5 net
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	skv@FreeBSD.org
-COMMENT=	POE component for non-blocking/concurrent ICMP ping
-
-BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
-		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-
-MAN3=		POE::Component::Client::Ping.3
-
-.include <bsd.port.mk>
diff --git a/net/p5-POE-Component-Client-Ping/distinfo b/net/p5-POE-Component-Client-Ping/distinfo
deleted file mode 100644
index 5d0901b48f16..000000000000
--- a/net/p5-POE-Component-Client-Ping/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (POE-Component-Client-Ping-1.02.tar.gz) = 03e3ad8a15285ec8718324416d4ff0d1
-SIZE (POE-Component-Client-Ping-1.02.tar.gz) = 10377
diff --git a/net/p5-POE-Component-Client-Ping/pkg-descr b/net/p5-POE-Component-Client-Ping/pkg-descr
deleted file mode 100644
index 268a2472df7c..000000000000
--- a/net/p5-POE-Component-Client-Ping/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-POE::Component::Client::Ping is non-blocking ICMP ping client session.
-It lets several other sessions ping through it in parallel, and it
-lets them continue doing other things while they wait for responses.
-
-WWW: http://search.cpan.org/dist/POE-Component-Client-Ping/
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/net/p5-POE-Component-Client-Ping/pkg-plist b/net/p5-POE-Component-Client-Ping/pkg-plist
deleted file mode 100644
index b58ec262f1d1..000000000000
--- a/net/p5-POE-Component-Client-Ping/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-%%SITE_PERL%%/POE/Component/Client/Ping.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Ping/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Ping
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
diff --git a/net/p5-POE-Component-Pcap/Makefile b/net/p5-POE-Component-Pcap/Makefile
deleted file mode 100644
index 740750d3abc6..000000000000
--- a/net/p5-POE-Component-Pcap/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for:	POE-Component-Pcap
-# Date created:		10 Dec 2001
-# Whom:			Sergey Skvortsov <skv@protey.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	POE-Component-Pcap
-PORTVERSION=	0.04
-CATEGORIES=	devel perl5 net
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	skv@FreeBSD.org
-COMMENT=	POE component for non-blocking use of Net::Pcap
-
-BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
-		${SITE_PERL}/${PERL_ARCH}/Net/Pcap.pm:${PORTSDIR}/net/p5-Net-Pcap \
-		${SITE_PERL}/NetPacket/Ethernet.pm:${PORTSDIR}/net/p5-NetPacket
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-
-MAN3=		POE::Component::Pcap.3
-
-.include <bsd.port.mk>
diff --git a/net/p5-POE-Component-Pcap/distinfo b/net/p5-POE-Component-Pcap/distinfo
deleted file mode 100644
index 33063e4f7380..000000000000
--- a/net/p5-POE-Component-Pcap/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (POE-Component-Pcap-0.04.tar.gz) = 11c6e6babcb8ee0b6a3c247c04059dc1
-SIZE (POE-Component-Pcap-0.04.tar.gz) = 6940
diff --git a/net/p5-POE-Component-Pcap/pkg-descr b/net/p5-POE-Component-Pcap/pkg-descr
deleted file mode 100644
index b2e0c5d73057..000000000000
--- a/net/p5-POE-Component-Pcap/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-POE::Component::Pcap provides a wrapper for using the Net::Pcap module
-from POE programs.  The component creates a separate session which posts
-events to a specified session and state when packets are available.
-
-WWW: http://search.cpan.org/dist/POE-Component-Pcap/
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/net/p5-POE-Component-Pcap/pkg-plist b/net/p5-POE-Component-Pcap/pkg-plist
deleted file mode 100644
index 371401577a37..000000000000
--- a/net/p5-POE-Component-Pcap/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Pcap/.packlist
-%%SITE_PERL%%/POE/Component/Pcap.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Pcap
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
diff --git a/net/pear-Net_URL2/Makefile b/net/pear-Net_URL2/Makefile
deleted file mode 100644
index 285d1b5d8505..000000000000
--- a/net/pear-Net_URL2/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Ports collection makefile for:  pear-Net_URL
-# Date created:			  2003-04-04
-# Whom:				  Roman Neuhauser (<neuhauser@bellavista.cz>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Net_URL
-PORTVERSION=	1.0.10
-PORTREVISION=	1
-CATEGORIES=	net www pear
-MASTER_SITES=	http://pear.php.net/get/
-PKGNAMEPREFIX=	pear-
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	PEAR
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Easy parsing of Urls
-
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-CATEGORY=	Net
-FILES=		URL.php
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
-.include <bsd.port.post.mk>
diff --git a/net/pear-Net_URL2/distinfo b/net/pear-Net_URL2/distinfo
deleted file mode 100644
index a272ff5488d1..000000000000
--- a/net/pear-Net_URL2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (PEAR/Net_URL-1.0.10.tgz) = 92db5fef86bb64da7c5edae6c63edb21
-SIZE (PEAR/Net_URL-1.0.10.tgz) = 4464
diff --git a/net/pear-Net_URL2/pkg-descr b/net/pear-Net_URL2/pkg-descr
deleted file mode 100644
index e2a24e808d08..000000000000
--- a/net/pear-Net_URL2/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Provides easy parsing of URLs and their constituent parts.
-
-WWW: http://pear.php.net/package-info.php?pacid=34
diff --git a/net/py-bittornado-core/Makefile b/net/py-bittornado-core/Makefile
deleted file mode 100644
index 6a90e51d3f20..000000000000
--- a/net/py-bittornado-core/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for:	py-shadow-bittorrent-core
-# Date created:				23 February 2004
-# Whom:					Stefan Walter <sw@gegenunendlich.de>
-#
-# $FreeBSD$
-#
-
-PKGNAMESUFFIX=	-core
-CATEGORIES=	net python
-
-COMMENT=	Experimental client 'core' for the BitTorrent P2P network
-
-# build only the CORE
-WITHOUT_GUI=	yes
-
-MASTERDIR=	${.CURDIR}/../py-shadow-bittorrent
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/py-bittornado/Makefile b/net/py-bittornado/Makefile
deleted file mode 100644
index d698415b9635..000000000000
--- a/net/py-bittornado/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# New ports collection makefile for:	shadow-BitTorrent
-# Date created:		23 February 2004
-# Whom:			Stefan Walter <sw@gegenunendlich.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	shadow-BitTorrent
-PORTVERSION=	5.8.11
-CATEGORIES?=	net python
-MASTER_SITES=	http://home.gil.com.au/~cbadsl/shadow/ \
-		http://mediahost.inetsalestech.com/shadow/
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	BitTorrent-experimental-S-${PORTVERSION}
-
-MAINTAINER=	sw@gegenunendlich.de
-COMMENT?=	Experimental BitTorrent client with enhanced features
-
-CONFLICTS=	py??-BitTorrent-*
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-USE_REINPLACE=	yes
-
-WRKSRC=		${WRKDIR}/bittorrent-CVS-shadowsclient
-
-DOC_FILES=	BUILD.windows.txt FAQ.txt IMPORTANT-multitracker-readme.txt \
-		INSTALL.unix.txt LICENSE.txt README.txt \
-		README-experimental.txt credits.txt multitracker-spec.txt \
-		webseed-spec.txt
-
-# required for GUI
-.ifndef(WITHOUT_GUI)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython
-PLIST_SUB+=	GUI=''
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extra-nogui-patch-setup.py
-PLIST_SUB+=	GUI='@comment '
-.endif
-
-.ifdef(WITH_PSYCO)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
-post-patch:
-	@${REINPLACE_CMD} -e "s/^psyco = 0/psyco = 1/g" \
-		${WRKSRC}/BitTorrent/PSYCO.py
-.endif
-
-pre-everything::
-.ifndef(WITHOUT_GUI)
-	@${ECHO_MSG} '===> Define WITHOUT_GUI to disable GUI installation'
-.endif
-.ifndef(WITH_PSYCO)
-	@${ECHO_MSG} '===> Define WITH_PSYCO to enable the optimizing Python compiler'
-.endif
-
-post-install:
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/py-bittornado/distinfo b/net/py-bittornado/distinfo
deleted file mode 100644
index a1812912e0fb..000000000000
--- a/net/py-bittornado/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (BitTorrent-experimental-S-5.8.11.tar.gz) = 1549187bd26f574127c444d272cc5881
-SIZE (BitTorrent-experimental-S-5.8.11.tar.gz) = 143004
diff --git a/net/py-bittornado/files/extra-nogui-patch-setup.py b/net/py-bittornado/files/extra-nogui-patch-setup.py
deleted file mode 100644
index 5b7ef858a45e..000000000000
--- a/net/py-bittornado/files/extra-nogui-patch-setup.py
+++ /dev/null
@@ -1,16 +0,0 @@
---- setup.py.old	Mon Feb 23 10:55:55 2004
-+++ setup.py	Mon Feb 23 10:57:25 2004
-@@ -18,10 +18,10 @@
-     
-     packages = ["BitTorrent"],
- 
--    scripts = ["btdownloadgui.py", "btdownloadheadless.py", "btdownloadlibrary.py", 
-+    scripts = ["btdownloadheadless.py", "btdownloadlibrary.py", 
-         "bttrack.py", "btmakemetafile.py", "btlaunchmany.py", "btcompletedir.py",
--        "btdownloadcurses.py", "btcompletedirgui.py", "btlaunchmanycurses.py", 
-+        "btdownloadcurses.py", "btlaunchmanycurses.py", 
-         "btmakemetafile.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py",
-         "bttest.py",
--        'btmaketorrentgui.py', 'btcopyannounce.py', 'btsethttpseeds.py', 'bt-t-make.py' ]
-+        'btcopyannounce.py', 'btsethttpseeds.py', 'bt-t-make.py' ]
-     )
diff --git a/net/py-bittornado/pkg-descr b/net/py-bittornado/pkg-descr
deleted file mode 100644
index bcceea200e4b..000000000000
--- a/net/py-bittornado/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-[ From the distribution's README-experimental.txt ]
-
-* Background file allocation - missing file space is allocated in
-  the background, and hashes are checked only for pre-existing data
-
-* Multitracker addition - .torrent file can now specify multiple
-  trackers
-
-* Preferences menu - lets you conveniently configure the GUI client
-
-* Status light - gives you important information about the torrent
-  at a glance
-
-WWW: http://bt.degreez.net/
diff --git a/net/py-bittornado/pkg-plist b/net/py-bittornado/pkg-plist
deleted file mode 100644
index 30c96eceff50..000000000000
--- a/net/py-bittornado/pkg-plist
+++ /dev/null
@@ -1,129 +0,0 @@
-bin/bt-t-make.py
-bin/btcompletedir.py
-%%GUI%%bin/btcompletedirgui.py
-bin/btcopyannounce.py
-bin/btdownloadcurses.py
-%%GUI%%bin/btdownloadgui.py
-bin/btdownloadheadless.py
-bin/btdownloadlibrary.py
-bin/btlaunchmany.py
-bin/btlaunchmanycurses.py
-bin/btmakemetafile.py
-%%GUI%%bin/btmaketorrentgui.py
-bin/btreannounce.py
-bin/btrename.py
-bin/btsethttpseeds.py
-bin/btshowmetainfo.py
-bin/bttest.py
-bin/bttrack.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConfigReader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConfigReader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConfigReader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConnChoice.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConnChoice.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConnChoice.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPDownloader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPDownloader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPDownloader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/PSYCO.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/PSYCO.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/PSYCO.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Statistics.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Statistics.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Statistics.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/T2T.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/T2T.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/T2T.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/download.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/download.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/download.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/subnetparse.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/subnetparse.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/subnetparse.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/testtest.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/testtest.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/testtest.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/track.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/track.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/track.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyo
-%%PORTDOCS%%%%DOCSDIR%%/BUILD.windows.txt
-%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
-%%PORTDOCS%%%%DOCSDIR%%/IMPORTANT-multitracker-readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.unix.txt
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
-%%PORTDOCS%%%%DOCSDIR%%/README-experimental.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/credits.txt
-%%PORTDOCS%%%%DOCSDIR%%/multitracker-spec.txt
-%%PORTDOCS%%%%DOCSDIR%%/webseed-spec.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
diff --git a/net/py-bittorrent-core-devel/Makefile b/net/py-bittorrent-core-devel/Makefile
deleted file mode 100644
index 95b96fdeb615..000000000000
--- a/net/py-bittorrent-core-devel/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# New ports collection makefile for:	py-bittorrent-core
-# Date created:				21 October 2003
-# Whom:		Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> and Mezz <mezz7@cox.net>
-#
-# $FreeBSD$
-#
-
-PKGNAMESUFFIX=	-core
-
-COMMENT=	Client 'core' for the BitTorrent peer-to-peer network
-
-# build only the CORE
-WITHOUT_GUI=	yes
-
-MASTERDIR=	${.CURDIR}/../py-bittorrent
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/py-bittorrent-devel/Makefile b/net/py-bittorrent-devel/Makefile
deleted file mode 100644
index 23db53979a29..000000000000
--- a/net/py-bittorrent-devel/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# New ports collection makefile for:	BitTorrent
-# Date created:		Sun Mar 16 06:34:12 UTC 2003
-# Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	BitTorrent
-PORTVERSION=	3.4.2
-PORTEPOCH=	1
-CATEGORIES?=	net python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	${PORTNAME:L}
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-#DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
-
-MAINTAINER=	lioux@FreeBSD.org
-COMMENT?=	A peer-to-peer tool for distributing files written in Python
-
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-USE_REINPLACE=	yes
-
-CONFLICTS=	py??-*[Bb]it[Tt]orrent*
-
-PORTDOCS=	BUILD.windows.txt INSTALL.unix.txt LICENSE.txt \
-		README.txt credits.txt
-
-# required for GUI
-.ifndef(WITHOUT_GUI)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython
-
-PLIST_SUB+=	GUI=''
-PLIST_FILES+=	\
-		bin/btcompletedirgui.py \
-		bin/btdownloadgui.py
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extra-nogui-patch-setup.py
-.endif
-
-pre-everything::
-.ifndef(WITHOUT_GUI)
-	@${ECHO_MSG} '===> Define WITHOUT_GUI to disable GUI installation'
-.endif
-
-post-patch:
-	@${FIND} ${WRKSRC} -type f | \
-		${XARGS} -x -n 10 \
-		${REINPLACE_CMD} -E \
-		-e 's|/usr/bin/env python2|${LOCALBASE}/bin/python|'
-.ifdef(WITHOUT_GUI)
-	@${REINPLACE_CMD} -E \
-		-e 's|btdownloadgui.py|btdownloadcurses.py|' \
-		${WRKSRC}/INSTALL.unix.txt
-.endif
-
-post-install:
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/py-bittorrent-devel/distinfo b/net/py-bittorrent-devel/distinfo
deleted file mode 100644
index dcdf62a43f57..000000000000
--- a/net/py-bittorrent-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (BitTorrent-3.4.2.tar.gz) = b854f25a33289565bcaeaded04955c1a
-SIZE (BitTorrent-3.4.2.tar.gz) = 198026
diff --git a/net/py-bittorrent-devel/files/extra-nogui-patch-setup.py b/net/py-bittorrent-devel/files/extra-nogui-patch-setup.py
deleted file mode 100644
index 7461547d430a..000000000000
--- a/net/py-bittorrent-devel/files/extra-nogui-patch-setup.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- setup.py.orig	Sun Mar 30 17:01:05 2003
-+++ setup.py	Sun Mar 30 17:01:20 2003
-@@ -18,9 +18,9 @@
-     
-     packages = ["BitTorrent"],
- 
--    scripts = ["btdownloadgui.py", "btdownloadheadless.py", "btdownloadlibrary.py", 
-+    scripts = ["btdownloadheadless.py", "btdownloadlibrary.py", 
-         "bttrack.py", "btmakemetafile.py", "btlaunchmany.py", "btcompletedir.py",
--        "btdownloadcurses.py", "btcompletedirgui.py", "btlaunchmanycurses.py", 
-+        "btdownloadcurses.py", "btlaunchmanycurses.py", 
-         "btmakemetafile.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py",
-         "bttest.py"]
-     )
diff --git a/net/py-bittorrent-devel/pkg-descr b/net/py-bittorrent-devel/pkg-descr
deleted file mode 100644
index 4ca529f824ef..000000000000
--- a/net/py-bittorrent-devel/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-[ excerpt from distribution's README.txt ]
-
-BitTorrent is a tool for distributing files. It's extremely easy
-to use - downloads are started by clicking on hyperlinks.  Whenever
-more than one person is downloading at once they send pieces of the
-file(s) to each other, thus relieving the central server's bandwidth
-burden. Even with many simultaneous downloads, the upload burden
-on the central server remains quite small, since each new downloader
-introduces new upload capacity.
-
-WWW: http://bitconjurer.org/BitTorrent/
diff --git a/net/py-bittorrent-devel/pkg-plist b/net/py-bittorrent-devel/pkg-plist
deleted file mode 100644
index b342f01be83f..000000000000
--- a/net/py-bittorrent-devel/pkg-plist
+++ /dev/null
@@ -1,93 +0,0 @@
-bin/btcompletedir.py
-bin/btdownloadcurses.py
-bin/btdownloadheadless.py
-bin/btdownloadlibrary.py
-bin/btlaunchmany.py
-bin/btlaunchmanycurses.py
-bin/btmakemetafile.py
-bin/btreannounce.py
-bin/btrename.py
-bin/btshowmetainfo.py
-bin/bttest.py
-bin/bttrack.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/download.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/download.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/download.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/testtest.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/testtest.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/testtest.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/track.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/track.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/track.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
diff --git a/net/py-kenosis-bittorrent/Makefile b/net/py-kenosis-bittorrent/Makefile
deleted file mode 100644
index 23db53979a29..000000000000
--- a/net/py-kenosis-bittorrent/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# New ports collection makefile for:	BitTorrent
-# Date created:		Sun Mar 16 06:34:12 UTC 2003
-# Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	BitTorrent
-PORTVERSION=	3.4.2
-PORTEPOCH=	1
-CATEGORIES?=	net python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	${PORTNAME:L}
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-#DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
-
-MAINTAINER=	lioux@FreeBSD.org
-COMMENT?=	A peer-to-peer tool for distributing files written in Python
-
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-USE_REINPLACE=	yes
-
-CONFLICTS=	py??-*[Bb]it[Tt]orrent*
-
-PORTDOCS=	BUILD.windows.txt INSTALL.unix.txt LICENSE.txt \
-		README.txt credits.txt
-
-# required for GUI
-.ifndef(WITHOUT_GUI)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython
-
-PLIST_SUB+=	GUI=''
-PLIST_FILES+=	\
-		bin/btcompletedirgui.py \
-		bin/btdownloadgui.py
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extra-nogui-patch-setup.py
-.endif
-
-pre-everything::
-.ifndef(WITHOUT_GUI)
-	@${ECHO_MSG} '===> Define WITHOUT_GUI to disable GUI installation'
-.endif
-
-post-patch:
-	@${FIND} ${WRKSRC} -type f | \
-		${XARGS} -x -n 10 \
-		${REINPLACE_CMD} -E \
-		-e 's|/usr/bin/env python2|${LOCALBASE}/bin/python|'
-.ifdef(WITHOUT_GUI)
-	@${REINPLACE_CMD} -E \
-		-e 's|btdownloadgui.py|btdownloadcurses.py|' \
-		${WRKSRC}/INSTALL.unix.txt
-.endif
-
-post-install:
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/py-kenosis-bittorrent/distinfo b/net/py-kenosis-bittorrent/distinfo
deleted file mode 100644
index dcdf62a43f57..000000000000
--- a/net/py-kenosis-bittorrent/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (BitTorrent-3.4.2.tar.gz) = b854f25a33289565bcaeaded04955c1a
-SIZE (BitTorrent-3.4.2.tar.gz) = 198026
diff --git a/net/py-kenosis-bittorrent/files/extra-nogui-patch-setup.py b/net/py-kenosis-bittorrent/files/extra-nogui-patch-setup.py
deleted file mode 100644
index 7461547d430a..000000000000
--- a/net/py-kenosis-bittorrent/files/extra-nogui-patch-setup.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- setup.py.orig	Sun Mar 30 17:01:05 2003
-+++ setup.py	Sun Mar 30 17:01:20 2003
-@@ -18,9 +18,9 @@
-     
-     packages = ["BitTorrent"],
- 
--    scripts = ["btdownloadgui.py", "btdownloadheadless.py", "btdownloadlibrary.py", 
-+    scripts = ["btdownloadheadless.py", "btdownloadlibrary.py", 
-         "bttrack.py", "btmakemetafile.py", "btlaunchmany.py", "btcompletedir.py",
--        "btdownloadcurses.py", "btcompletedirgui.py", "btlaunchmanycurses.py", 
-+        "btdownloadcurses.py", "btlaunchmanycurses.py", 
-         "btmakemetafile.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py",
-         "bttest.py"]
-     )
diff --git a/net/py-kenosis-bittorrent/pkg-descr b/net/py-kenosis-bittorrent/pkg-descr
deleted file mode 100644
index 4ca529f824ef..000000000000
--- a/net/py-kenosis-bittorrent/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-[ excerpt from distribution's README.txt ]
-
-BitTorrent is a tool for distributing files. It's extremely easy
-to use - downloads are started by clicking on hyperlinks.  Whenever
-more than one person is downloading at once they send pieces of the
-file(s) to each other, thus relieving the central server's bandwidth
-burden. Even with many simultaneous downloads, the upload burden
-on the central server remains quite small, since each new downloader
-introduces new upload capacity.
-
-WWW: http://bitconjurer.org/BitTorrent/
diff --git a/net/py-kenosis-bittorrent/pkg-plist b/net/py-kenosis-bittorrent/pkg-plist
deleted file mode 100644
index b342f01be83f..000000000000
--- a/net/py-kenosis-bittorrent/pkg-plist
+++ /dev/null
@@ -1,93 +0,0 @@
-bin/btcompletedir.py
-bin/btdownloadcurses.py
-bin/btdownloadheadless.py
-bin/btdownloadlibrary.py
-bin/btlaunchmany.py
-bin/btlaunchmanycurses.py
-bin/btmakemetafile.py
-bin/btreannounce.py
-bin/btrename.py
-bin/btshowmetainfo.py
-bin/bttest.py
-bin/bttrack.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/download.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/download.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/download.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/testtest.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/testtest.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/testtest.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/track.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/track.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/track.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
diff --git a/net/py-zsi-devel/Makefile b/net/py-zsi-devel/Makefile
deleted file mode 100644
index 26191c37a11a..000000000000
--- a/net/py-zsi-devel/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# New ports collection makefile for:	py-zsi
-# Date created:		17 September 2001
-# Whom:	      		Johann Visagie <wjv@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	zsi
-PORTVERSION=	1.22.6
-CATEGORIES=	net python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pywebsvcs
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME:U}-${PORTVERSION:C|\.([^.]*)$|-\1|}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	wjv@FreeBSD.org
-COMMENT=	A pure Python module that provides an implementation of SOAP 1.1
-
-RUN_DEPENDS=	${PYXML}
-
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME:U}-1.2
-
-pre-install:
-	@ ${SH} ${PKGREQ} INSTALL
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${DOCSDIR}
-.for docfile in CHANGES README doc/zsi.* doc/*.tex
-	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
-.endfor
-.for subdir in interop samples test
-	@ ${MKDIR} ${EXAMPLESDIR}/${subdir}
-	@ ${INSTALL_DATA} ${WRKSRC}/${subdir}/* ${EXAMPLESDIR}/${subdir}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/py-zsi-devel/distinfo b/net/py-zsi-devel/distinfo
deleted file mode 100644
index 370196f544f0..000000000000
--- a/net/py-zsi-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (ZSI-1.22-6.tgz) = fb856af33d83fd883b334c0be8cc3309
-SIZE (ZSI-1.22-6.tgz) = 231571
diff --git a/net/py-zsi-devel/pkg-descr b/net/py-zsi-devel/pkg-descr
deleted file mode 100644
index 5c06fb17e68c..000000000000
--- a/net/py-zsi-devel/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-Paraphrasing the original (1.0 and 1.1) website:
-
-  ZSI, the Zolera SOAP Infrastructure, is a pure Python module that provides
-  an implementation of the SOAP 1.1 specification.  ZSI parses and generates
-  SOAP messages, and converts between native Python datatypes and SOAP
-  syntax.  Simple client and server support are also provided.
-
-  ZSI is built on top of DOM.  It requires Python 2.0 or later, and PyXML 0.6
-  or later.  Feedback to <zsi@zolera.com>.
-
-Author: Rich Salz <rsalz@zolera.com>
-WWW:    http://pywebsvcs.sourceforge.net/
-
--- Johann Visagie <wjv@FreeBSD.org>
diff --git a/net/py-zsi-devel/pkg-plist b/net/py-zsi-devel/pkg-plist
deleted file mode 100644
index 43d4082b83c9..000000000000
--- a/net/py-zsi-devel/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-%%PORTDOCS%%share/doc/zsi/CHANGES
-%%PORTDOCS%%share/doc/zsi/README
-%%PORTDOCS%%share/doc/zsi/c01-intro.tex
-%%PORTDOCS%%share/doc/zsi/c02-samples.tex
-%%PORTDOCS%%share/doc/zsi/c03-except.tex
-%%PORTDOCS%%share/doc/zsi/c04-utils.tex
-%%PORTDOCS%%share/doc/zsi/c05-parse.tex
-%%PORTDOCS%%share/doc/zsi/c06-tc.tex
-%%PORTDOCS%%share/doc/zsi/c07-writer.tex
-%%PORTDOCS%%share/doc/zsi/c08-fault.tex
-%%PORTDOCS%%share/doc/zsi/c09-resolve.tex
-%%PORTDOCS%%share/doc/zsi/c10-dispatch.tex
-%%PORTDOCS%%share/doc/zsi/version.tex
-%%PORTDOCS%%share/doc/zsi/zsi.css
-%%PORTDOCS%%share/doc/zsi/zsi.html
-%%PORTDOCS%%share/doc/zsi/zsi.pdf
-%%PORTDOCS%%share/doc/zsi/zsi.ps
-%%PORTDOCS%%share/doc/zsi/zsi.tex
-%%PORTDOCS%%share/doc/zsi/zsi.xsd
-%%PORTDOCS%%share/doc/zsi/zsixsd.tex
-%%PORTDOCS%%share/examples/zsi/interop/InteropTest.wsdl
-%%PORTDOCS%%share/examples/zsi/interop/InteropTestB.wsdl
-%%PORTDOCS%%share/examples/zsi/interop/README
-%%PORTDOCS%%share/examples/zsi/interop/client.py
-%%PORTDOCS%%share/examples/zsi/interop/cpackets.py
-%%PORTDOCS%%share/examples/zsi/interop/echoHeaderBindings.wsdl
-%%PORTDOCS%%share/examples/zsi/interop/sclasses.py
-%%PORTDOCS%%share/examples/zsi/interop/server.py
-%%PORTDOCS%%share/examples/zsi/samples/README
-%%PORTDOCS%%share/examples/zsi/samples/poly.py
-%%PORTDOCS%%share/examples/zsi/test/README
-%%PORTDOCS%%share/examples/zsi/test/cgicli.py
-%%PORTDOCS%%share/examples/zsi/test/t1.py
-%%PORTDOCS%%share/examples/zsi/test/t2.py
-%%PORTDOCS%%share/examples/zsi/test/t3.py
-%%PORTDOCS%%share/examples/zsi/test/t4.py
-%%PORTDOCS%%share/examples/zsi/test/t5.py
-%%PORTDOCS%%share/examples/zsi/test/t6.py
-%%PORTDOCS%%share/examples/zsi/test/t7.py
-%%PORTDOCS%%share/examples/zsi/test/tests.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TC.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TC.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TC.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCapache.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCapache.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCapache.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCcompound.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCcompound.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCcompound.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCnumbers.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCnumbers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCnumbers.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCtimes.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCtimes.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCtimes.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/auth.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/auth.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/auth.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/client.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/client.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/client.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/compat.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/compat.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/compat.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/dispatch.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/dispatch.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/dispatch.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/fault.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/fault.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/fault.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/parse.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/parse.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/parse.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/resolvers.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/resolvers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/resolvers.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/version.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/version.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/version.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/writer.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/writer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/writer.pyo
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/ZSI
-%%PORTDOCS%%@dirrm share/examples/zsi/test
-%%PORTDOCS%%@dirrm share/examples/zsi/samples
-%%PORTDOCS%%@dirrm share/examples/zsi/interop
-%%PORTDOCS%%@dirrm share/examples/zsi
-%%PORTDOCS%%@dirrm share/doc/zsi
diff --git a/net/py-zsi-devel/pkg-req b/net/py-zsi-devel/pkg-req
deleted file mode 100644
index fd3eb3555f86..000000000000
--- a/net/py-zsi-devel/pkg-req
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-PATH=$PATH:/usr/local/bin
-
-if [ "x$1" = "xINSTALL" -o "x$2" = "xINSTALL" ]; then
-  PYTHON_GT=`python -c 'import string, sys; \
-                        print string.split(sys.version)[0] >= "2.0" and 1'`
-  if [ "x${PYTHON_GT}" = "x1" ]; then
-    exit 0
-  else
-    echo "-----------------------------------------------------------"
-    echo "ZSI requires Python version 2.0 or greater -"
-    echo "  please update your Python installation before proceeding."
-    echo "-----------------------------------------------------------"
-    exit 1
-  fi
-fi
diff --git a/net/rqm/Makefile b/net/rqm/Makefile
deleted file mode 100644
index c651b7f9defb..000000000000
--- a/net/rqm/Makefile
+++ /dev/null
@@ -1,33 +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
-COMMENT=	A graphical RTP quality monitor
-
-LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
-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 3af212d4c836..000000000000
--- a/net/rqm/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rqm-1.0.0.tar.gz) = 406a9bfe4a3e9ad9f1a981701072f54a
-SIZE (rqm-1.0.0.tar.gz) = 3853534
diff --git a/net/rqm/files/patch-aa b/net/rqm/files/patch-aa
deleted file mode 100644
index ba0b3c041db2..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 -ltk84 -ltcl84"
-+TCL_INCL="-I${PREFIX}/include/tk8.4/generic -I${PREFIX}/include/tcl8.4/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 c6f546039ba6..000000000000
--- a/net/rqm/files/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
---- main.c.orig	Wed Mar  8 08:32:07 2000
-+++ main.c	Wed Mar  8 08:32:28 2000
-@@ -67,7 +67,7 @@
- 	}
- }
- 
--static void rtp_callback(struct rtp *s, rtp_event *e)
-+static void rqm_rtp_callback(struct rtp *s, rtp_event *e)
- {
- 	rtp_packet	*p    = (rtp_packet *)     e->data;
- 	rtcp_sr         *sr   = (rtcp_sr *)        e->data;
-@@ -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) {
-@@ -199,7 +199,7 @@
- 	addr = (char *) strtok(argv[1], "/");
- 	port = (char *) strtok(NULL, "\0");
- 
--	rtp_session = rtp_init(addr, atoi(port), atoi(port), 15, 64000, rtp_callback, NULL);
-+	rtp_session = rtp_init(addr, atoi(port), atoi(port), 15, 64000, rqm_rtp_callback, NULL);
- 
- 	/* Initialise the user interface... */
- 	if (tcl_init(argc, argv) == FALSE) {
-@@ -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/files/patch-ac b/net/rqm/files/patch-ac
deleted file mode 100644
index 00ed9055e3ea..000000000000
--- a/net/rqm/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sun Feb  1 17:22:05 2004
-+++ Makefile.in	Sun Feb  1 17:22:12 2004
-@@ -6,7 +6,7 @@
- OBJS   = main.o ui.o 
- BIN    = rqm 
- 
--$(BIN): $(OBJS) ../common/libcommon.a
-+$(BIN): $(OBJS)
- 	$(CC) $(CFLAGS) $(OBJS) __LDLIBS__ __PROFILE__ __OPTIMIZE__ __CHECK_LIB__ -o $(BIN)
- 
- .c.o:
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 08abd53a0e8d..000000000000
--- a/net/rrdtool10/Makefile
+++ /dev/null
@@ -1,54 +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.47
-CATEGORIES=	net
-MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
-
-MAINTAINER=	demon@FreeBSD.org
-COMMENT=	Round Robin Database Tools
-
-USE_PERL5=	yes
-MAKE_ENV+=	PERL=${PERL}
-
-GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--enable-shared --enable-local-zlib \
-		--program-transform-name=''
-CONFIGURE_ENV=	PERL=${PERL}
-CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
-LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS:=	${CFLAGS:N-ffast-math}
-
-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 rrdtutorial.es.1 rrdupdate.1 \
-		cdeftutorial.1 rpntutorial.1 rrdinfo.1 rrdxport.1 rrd-beginners.1
-MAN3=		RRDp.3 RRDs.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
-.if defined(WITH_LATIN2)
-CONFIGURE_ARGS+=	--with-latin2
-.endif
-
-pre-extract:
-.if !defined(WITH_LATIN2)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You can enable support for ISO-8859-2 fonts by defining WITH_LATIN2."
-	@${ECHO_MSG} ""
-.endif
-
-post-install:
-.if !defined(BATCH)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "############################################################################"
-	@${ECHO_MSG} "# See ${PREFIX}/share/examples/rrdtool for some demonstration code        #"
-	@${ECHO_MSG} "############################################################################"
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/rrdtool10/distinfo b/net/rrdtool10/distinfo
deleted file mode 100644
index da1030ebe725..000000000000
--- a/net/rrdtool10/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rrdtool-1.0.47.tar.gz) = 19fec533ad125b2538f5e27b3be6dfd6
-SIZE (rrdtool-1.0.47.tar.gz) = 1462489
diff --git a/net/rrdtool10/files/patch-aa b/net/rrdtool10/files/patch-aa
deleted file mode 100644
index a6bd67160b15..000000000000
--- a/net/rrdtool10/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- perl-shared/Makefile.PL.in.orig	Sat Apr  3 18:33:13 2004
-+++ perl-shared/Makefile.PL.in	Tue Apr  6 10:49:27 2004
-@@ -10,7 +10,7 @@
-     'NAME'         => 'RRDs',
-     'VERSION_FROM' => '@top_srcdir@/perl-shared/RRDs.pm', # finds $VERSION
-     'DEFINE'	   => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
--    'INC'          => '-I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
-+    'INC'          => '-I../ -I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
-     'CCFLAGS'      => '-DHAVE_CONFIG_H',
-     # where to look for the necessary libraries 
-     # Perl will figure out which one is valid
diff --git a/net/rrdtool10/files/patch-ab b/net/rrdtool10/files/patch-ab
deleted file mode 100644
index 5a2116ef58fb..000000000000
--- a/net/rrdtool10/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/rrd_tool.c.orig	Mon Apr  5 02:13:52 2004
-+++ src/rrd_tool.c	Tue Apr  6 10:51:41 2004
-@@ -340,12 +340,12 @@
- 	    datai=data;
- 	    printf("          ");
- 	    for (i = 0; i<ds_cnt;i++)
--	        printf(" %20s",ds_namv[i]);
-+	        printf(" %20s ",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 52f476f929b8..000000000000
--- a/net/rrdtool10/files/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.in.orig	Mon Apr  5 02:03:53 2004
-+++ Makefile.in	Tue Apr  6 10:53:31 2004
-@@ -633,13 +633,7 @@
- # lets schedule the perl stuff for installation
- # the special call to install-sh is because the -d switch is not portable
- # mac os X has its perl module in bundles so it seems
--install-data-local:
--	$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
--	$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
--	$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
--	$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
--	test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
--	test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
-+install-data-local: site-perl-inst
- 
- # rules for building the perl module
- 
diff --git a/net/rrdtool10/files/patch-ae b/net/rrdtool10/files/patch-ae
deleted file mode 100644
index b1465ab16354..000000000000
--- a/net/rrdtool10/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/Makefile.in.orig	Sun Apr 14 11:51:02 2002
-+++ doc/Makefile.in	Wed May  1 16:05:42 2002
-@@ -110,9 +110,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 ab74382bf032..000000000000
--- a/net/rrdtool10/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/Makefile.in.orig	Sun Apr 14 11:51:04 2002
-+++ examples/Makefile.in	Wed May  1 16:07:13 2002
-@@ -93,7 +93,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 205d5ac7228c..000000000000
--- a/net/rrdtool10/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/Makefile.in.orig Sun Apr 14 11:51:05 2002
-+++ contrib/Makefile.in	Wed May  1 16:08:10 2002
-@@ -88,7 +88,7 @@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- 
- SUBDIRS = trytime
--contribdir = $(prefix)/contrib
-+contribdir = $(prefix)/share/examples/rrdtool
- contrib_DATA = README
- EXTRA_DIST = rrdview log2rrd rrd-file-icon rrdproc rrdlastds add_ds killspike rrdfetchnames snmpstats rrdexplorer php3 php4
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/net/rrdtool10/files/patch-ak b/net/rrdtool10/files/patch-ak
deleted file mode 100644
index 982c95f4fd38..000000000000
--- a/net/rrdtool10/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/trytime/Makefile.in.orig	Mon Apr  5 02:03:53 2004
-+++ contrib/trytime/Makefile.in	Tue Apr  6 11:17:12 2004
-@@ -162,7 +162,7 @@
- target_vendor = @target_vendor@
- AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
- EXTRA_DIST = trytime.c
--contribdir = $(prefix)/contrib/trytime
-+contribdir = $(prefix)/share/examples/rrdtool/trytime
- contrib_DATA = README trytime.c
- bin_PROGRAMS = trytime
- trytime_SOURCES = trytime.c
diff --git a/net/rrdtool10/pkg-descr b/net/rrdtool10/pkg-descr
deleted file mode 100644
index 4b15e3d55ab5..000000000000
--- a/net/rrdtool10/pkg-descr
+++ /dev/null
@@ -1,10 +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. 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/
diff --git a/net/rrdtool10/pkg-plist b/net/rrdtool10/pkg-plist
deleted file mode 100644
index 6235d8efb1b3..000000000000
--- a/net/rrdtool10/pkg-plist
+++ /dev/null
@@ -1,92 +0,0 @@
-bin/rrdtool
-bin/rrdcgi
-bin/trytime
-bin/rrdupdate
-lib/librrd.a
-lib/librrd.la
-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/trytime/trytime.c
-share/examples/rrdtool/trytime/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/rrdtutorial.es.pod
-share/doc/rrdtool/rrdxport.pod
-share/doc/rrdtool/rrd-beginners.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/rrdtutorial.es.txt
-share/doc/rrdtool/RRDs.txt
-share/doc/rrdtool/RRDp.txt
-share/doc/rrdtool/rrdxport.txt
-share/doc/rrdtool/rrd-beginners.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/rrdtutorial.es.html
-share/doc/rrdtool/html/RRDs.html
-share/doc/rrdtool/html/RRDp.html
-share/doc/rrdtool/html/rrdxport.html
-share/doc/rrdtool/html/rrd-beginners.html
-%%SITE_PERL%%/RRDp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ntmake.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
-@dirrm share/examples/rrdtool/trytime
-@dirrm share/examples/rrdtool
-@dirrm share/doc/rrdtool/html
-@dirrm share/doc/rrdtool
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs
diff --git a/net/rtptools/Makefile b/net/rtptools/Makefile
deleted file mode 100644
index a4f8ef3f5c17..000000000000
--- a/net/rtptools/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for:	rtptools
-# Date created:		5 January 1998
-# Whom:			fenner
-#
-# $FreeBSD$
-#
-
-PORTNAME=	rtptools
-PORTVERSION=	1.17
-CATEGORIES=	mbone
-MASTER_SITES=	http://www.cs.columbia.edu/IRT/software/rtptools/download/
-
-MAINTAINER=	fenner@FreeBSD.org
-COMMENT=	A set of tools to record, playback and monitor RTPv2 data streams
-
-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 ff94a72ca8fe..000000000000
--- a/net/rtptools/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rtptools-1.17.tar.gz) = 4af6ef6ba430f659d3d6478719911b65
-SIZE (rtptools-1.17.tar.gz) = 96358
diff --git a/net/rtptools/files/patch-ab b/net/rtptools/files/patch-ab
deleted file mode 100644
index c1d142b4a914..000000000000
--- a/net/rtptools/files/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
---- rtp.h.orig	Thu Mar  9 07:35:26 2000
-+++ rtp.h	Sat Apr 21 21:52:49 2001
-@@ -110,13 +110,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 */
diff --git a/net/rtptools/files/patch-ac b/net/rtptools/files/patch-ac
deleted file mode 100644
index 28056951ca69..000000000000
--- a/net/rtptools/files/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
---- rtpdump.c.orig	Sat Apr  7 08:02:13 2001
-+++ rtpdump.c	Sat Apr 21 21:54:10 2001
-@@ -429,8 +429,8 @@
-         for (i = 0; i < r->common.count; i++) {
-           fprintf(out, "  (ssrc=0x%lx 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),
-@@ -446,8 +446,8 @@
-         for (i = 0; i < r->common.count; i++) {
-           fprintf(out, "  (ssrc=0x%lx 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),
diff --git a/net/rtptools/files/patch-ad b/net/rtptools/files/patch-ad
deleted file mode 100644
index e7bbdd966728..000000000000
--- a/net/rtptools/files/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
---- rtpsend.c.orig	Fri Apr  6 18:18:26 2001
-+++ rtpsend.c	Sat Apr 21 21:59:35 2001
-@@ -351,9 +351,9 @@
-       if (strcmp(n->type, "ssrc") == 0)
-         rr->ssrc = htonl(n->num);
-       else if (strcmp(n->type, "fraction") == 0)
--        rr->fraction = (n->num)*256;
--      else if (strcmp(n->type, "lost") == 0)   /* PP: alignment OK? */
--        rr->lost = htonl(n->num);
-+        rr->fraclost = htonl((ntohl(rr->fraclost) & 0x00ffffff) | ((n->num)*256 << 24));
-+      else if (strcmp(n->type, "lost") == 0)
-+	rr->fraclost = htonl((ntohl(rr->fraclost) & 0xff000000) | n->num);
-       else if (strcmp(n->type, "last_seq") == 0)
-         rr->last_seq = htonl(n->num);
-       else if (strcmp(n->type, "jit") == 0)
-@@ -899,6 +899,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-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 1feb090e28b7..000000000000
--- a/net/rwhoisd/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# New ports collection makefile for:	rwhois
-# Date created:				May 9th 1997
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	rwhois
-PORTVERSION=	1.5.7.3
-PORTREVISION=	1
-CATEGORIES=	net ipv6
-MASTER_SITES=	ftp://ftp.ayamura.org/pub/rwhois/ \
-		ftp://ftp.jp.pgpi.org/pub/rwhois/
-DISTNAME=	${PORTNAME}d-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The Internic referral whois server
-
-.if !exists(/usr/include/tcpd.h)
-LIB_DEPENDS=	wrap.7:${PORTSDIR}/security/tcp_wrapper
-.endif
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}/lib/rwhois
-
-BINOWN=		bin
-BINGRP=		bin
-
-MAN8=		rwhois_indexer.8 rwhoisd.8
-
-MYPORTDOCS=	INSTALL.html TODO UPGRADE operations_guide.html \
-		operations_guide.txt rfc2167.txt security.html security.txt
-
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/rwhois_indexer.8 ${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/doc/rwhoisd.8 ${PREFIX}/man/man8
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${MYPORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
-.endfor
-.endif
-	@${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.mk>
diff --git a/net/rwhoisd/distinfo b/net/rwhoisd/distinfo
deleted file mode 100644
index d6b9f3dd6116..000000000000
--- a/net/rwhoisd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rwhoisd-1.5.7.3.tar.gz) = b3a1d951454afec598a7531919ce22a0
-SIZE (rwhoisd-1.5.7.3.tar.gz) = 452141
diff --git a/net/rwhoisd/files/patch-aa b/net/rwhoisd/files/patch-aa
deleted file mode 100644
index c3ff541a6aaa..000000000000
--- a/net/rwhoisd/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Tue Jun  3 23:20:53 1997
-+++ Makefile.in	Sat Nov 25 15:44:00 2000
-@@ -25,7 +25,7 @@
- BIN_SUBDIRS	= server tools
- ALL_SUBDIRS	= $(LIB_SUBDIRS) $(BIN_SUBDIRS) $(SAMPLE_DATA_DIR)
- 
--all: libraries libwrap binaries
-+all: libraries binaries
- 
- libraries:
- 	@for dir in $(LIB_SUBDIRS); do \
diff --git a/net/rwhoisd/files/patch-ac b/net/rwhoisd/files/patch-ac
deleted file mode 100644
index 05ca015c5c8c..000000000000
--- a/net/rwhoisd/files/patch-ac
+++ /dev/null
@@ -1,33 +0,0 @@
---- server/Makefile.in.orig	Fri May 12 01:10:25 2000
-+++ server/Makefile.in	Sat Nov 25 15:27:16 2000
-@@ -9,7 +9,7 @@
- prefix      = @prefix@
- exec_prefix = @exec_prefix@
- bindir      = $(exec_prefix)/bin
--etcdir      = $(exec_prefix)/etc
-+sbindir     = $(exec_prefix)/sbin
- 
- srcdir      = @srcdir@
- VPATH       = @srcdir@
-@@ -18,8 +18,8 @@
- COMMON_INC    = -I$(srcdir)/../common
- COMMON_LIBS   = -L../common -lrwcommon
- 
--WRAP_INC      = -I$(srcdir)../tools/tcpd_wrapper
--WRAP_LIBS     = -L../tools/tcpd_wrapper -lwrap
-+WRAP_INC      = -I${LOCALBASE}/include
-+WRAP_LIBS     = -L${LOCALBASE}/lib -lwrap
- 
- MKDB_INC      = -I$(srcdir)/../mkdb
- MKDB_LIBS     = -L../mkdb -lmkdb
-@@ -97,8 +97,8 @@
- 
- install:
- 	if [ ! -d $(exec_prefix) ]; then mkdir $(exec_prefix); fi
--	if [ ! -d $(etcdir) ]; then mkdir $(etcdir); fi
--	$(INSTALL) rwhoisd $(etcdir)
-+	if [ ! -d $(sbindir) ]; then mkdir $(sbindir); fi
-+	$(INSTALL) rwhoisd $(sbindir)
- 
- uninstall:
- 	$(RM) $(etcdir)/rwhoisd
diff --git a/net/rwhoisd/files/patch-ae b/net/rwhoisd/files/patch-ae
deleted file mode 100644
index 6d86925ae455..000000000000
--- a/net/rwhoisd/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- sample.data/rwhoisd.conf.orig	Wed Nov 26 08:23:46 1997
-+++ sample.data/rwhoisd.conf	Sat Nov 25 15:30:05 2000
-@@ -109,7 +109,7 @@
- # users group, as found in /etc/passwd.
- # note that this really, really should be an unprivileged user
- # this options doesn't have a default.
--userid: rwhoisd
-+userid: nobody
- 
- # pid-file: where to put the file containing the pid of the server.
- # normal default is "rwhoisd.pid"
diff --git a/net/rwhoisd/files/patch-common-client_msgs.c b/net/rwhoisd/files/patch-common-client_msgs.c
deleted file mode 100644
index 77a8d9a2ef23..000000000000
--- a/net/rwhoisd/files/patch-common-client_msgs.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- common/client_msgs.c.orig	Tue Oct 28 02:24:02 2003
-+++ common/client_msgs.c	Tue Oct 28 02:25:00 2003
-@@ -145,22 +145,16 @@
-   printf ("%%ok\n");
- }
- 
--void print_response(va_alist)
--    va_dcl
-+void print_response(int resp_no, char *format, ...)
- {
-   va_list list;
-   int i;
--  int resp_no;
--  char *format;
-   FILE *fp;
- 
--  va_start(list);
-+  va_start(list, format);
- 
-   fp = get_out_fp();
- 
--  resp_no = va_arg(list, int);
--  format = va_arg(list, char *);
--
-   for (i = 0; i < N_RESP; i++)
-   {
-     if (resp[i].resp_no == resp_no)
-@@ -179,6 +173,7 @@
-   }
- 
-   vfprintf(fp, format, list);
-+  va_end(list);
- 
-   fprintf(fp, "\n");
- }
diff --git a/net/rwhoisd/files/patch-common-client_msgs.h b/net/rwhoisd/files/patch-common-client_msgs.h
deleted file mode 100644
index 625697efba0b..000000000000
--- a/net/rwhoisd/files/patch-common-client_msgs.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/client_msgs.h.orig	Tue Oct 28 02:25:14 2003
-+++ common/client_msgs.h	Tue Oct 28 02:25:30 2003
-@@ -85,7 +85,7 @@
- 
- void print_error PROTO((int err_no, char *str));
- 
--void print_response PROTO(());
-+void print_response PROTO((int resp_no, char *format, ...));
- 
- void print_ok PROTO((void));
- 
diff --git a/net/rwhoisd/files/patch-common-common.h b/net/rwhoisd/files/patch-common-common.h
deleted file mode 100644
index 84f7d11ad8fd..000000000000
--- a/net/rwhoisd/files/patch-common-common.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/common.h.orig	Tue Oct 28 02:23:23 2003
-+++ common/common.h	Tue Oct 28 02:23:33 2003
-@@ -56,7 +56,7 @@
- # undef _VA_ALIGN
- # undef __va_stack_arg
- # endif
--#include <varargs.h>
-+#include <stdarg.h>
- #endif /* HAVE_VPRINTF */
- 
- /* this should probably be #ifdef USG */
diff --git a/net/rwhoisd/files/patch-common-log.c b/net/rwhoisd/files/patch-common-log.c
deleted file mode 100644
index c4da8e6e911d..000000000000
--- a/net/rwhoisd/files/patch-common-log.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- common/log.c.orig	Tue Oct 28 02:26:55 2003
-+++ common/log.c	Tue Oct 28 02:28:25 2003
-@@ -139,15 +139,12 @@
- /* log_error: prints a error message to the console. This is intended
-      for server side errors only. */
- void
--log_error(va_alist)
--  va_dcl
-+log_error(char *format, ...)
- {
-   va_list   list;
--  char      *format;
-   char      err_buf[MAX_LINE];
-   
--  va_start(list);
--  format = va_arg(list, char *);
-+  va_start(list, format);
- 
- #ifdef HAVE_VSNPRINTF
-   vsnprintf(err_buf, sizeof(err_buf), format, list);
-@@ -164,15 +161,12 @@
- /* log_warning: prints a warning message to the console. This is intended
-    for server side warnings only. */
- void
--log_warning(va_alist)
--  va_dcl
-+log_warning(char *format, ...)
- {
-   va_list   list;
--  char      *format;
-   char      err_buf[MAX_LINE];
-   
--  va_start(list);
--  format = va_arg(list, char *);
-+  va_start(list, format);
- 
- #ifdef HAVE_VSNPRINTF
-   vsnprintf(err_buf, sizeof(err_buf), format, list);
diff --git a/net/rwhoisd/files/patch-common-log.h b/net/rwhoisd/files/patch-common-log.h
deleted file mode 100644
index 1c105a1f8612..000000000000
--- a/net/rwhoisd/files/patch-common-log.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- common/log.h.orig	Tue Oct 28 02:25:55 2003
-+++ common/log.h	Tue Oct 28 02:29:55 2003
-@@ -95,8 +95,8 @@
- /* old prototypes for backward compatibility */
- 
- #define l_strerror strerror
--void log_error PROTO(());
--void log_warning PROTO(());
-+void log_error PROTO((char *format, ...));
-+void log_warning PROTO((char *format, ...));
- char *get_client_hostname PROTO((int sock));
- char *timestamp PROTO(());
- 
-@@ -106,7 +106,8 @@
-      (L_LOG_EMERG, L_LOG_ALERT, etc. [see internal_log_level in
-      types.h) and SECTION is one of (NETWORK, QUERY, CONFIG, etc [see
-      log_section in types.h) */
--void log PROTO(());
-+#define log Log
-+void log PROTO((internal_log_levels level, int section, char *format, ...));
- 
- void setup_logging PROTO((void));
- 
diff --git a/net/rwhoisd/files/patch-common-rw_log.c b/net/rwhoisd/files/patch-common-rw_log.c
deleted file mode 100644
index 3807b136a551..000000000000
--- a/net/rwhoisd/files/patch-common-rw_log.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- common/rw_log.c.orig	Tue Oct 28 02:28:43 2003
-+++ common/rw_log.c	Tue Oct 28 02:30:14 2003
-@@ -17,13 +17,10 @@
- #include "types.h"
- 
- void
--log(va_alist)
--  va_dcl
-+log(internal_log_levels level, int section, char *format, ...)
- {
-   va_list             ap;
--  internal_log_levels level;
-   FILE                *fp;
--  char                *format;
-   char                *filename;
-   char                *hostname;
-   char                message[MAX_LINE];
-@@ -31,13 +28,9 @@
-   char                *section_name;
-   int                 fd;
-   int                 use_syslog;
--  int                 section;
-   int                 syslog_level;
- 
--  va_start(ap);
--  level   = (internal_log_levels) va_arg(ap, int);
--  section = (int) va_arg(ap, int);
--  format  = va_arg(ap, char*);
-+  va_start(ap, format);
- 
-   /* verbosity sets the level at which we ignore log messages */
-   if (level > get_verbosity())
-@@ -142,4 +135,5 @@
- 
-     fclose(fp);
-   }
-+  va_end(ap);
- }
diff --git a/net/rwhoisd/files/patch-server-notify.c b/net/rwhoisd/files/patch-server-notify.c
deleted file mode 100644
index e4e71a95d91b..000000000000
--- a/net/rwhoisd/files/patch-server-notify.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- server/notify.c.orig	Tue Oct 28 02:30:38 2003
-+++ server/notify.c	Tue Oct 28 02:31:26 2003
-@@ -75,18 +75,13 @@
- 
- /* log notify information */
- int
--log_entry(va_alist)
--  va_dcl
-+log_entry(char *filename, char *format, ...)
- {
-   va_list   ap;
-   FILE      *fp;
--  char      *format;
--  char      *filename;
-   char      *hostname;
- 
--  va_start(ap);
--  filename  = va_arg (ap, char*);
--  format    = va_arg(ap, char*);
-+  va_start(ap, format);
- 
-   /* lock the file */
-   fp = get_file_lock(filename, "a", 60);
-@@ -103,6 +98,7 @@
-   fprintf(fp, " [%-15s] PID: %-8d", hostname, (int) getpid());
-   vfprintf(fp, format, ap);
-   fprintf(fp, "\n");
-+  va_end(ap);
- 
-   release_file_lock(filename, fp);
- 
diff --git a/net/rwhoisd/files/patch-server-notify.h b/net/rwhoisd/files/patch-server-notify.h
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net/rwhoisd/files/patch-server-notify.h
+++ /dev/null
diff --git a/net/rwhoisd/files/rwhoisd.sh b/net/rwhoisd/files/rwhoisd.sh
deleted file mode 100644
index cc977b591234..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."
-	#if [ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ]; then (${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhoisd.conf &); echo -n ' rwhoisd'; fi
-	;;
-stop)
-	# killall rwhoisd && echo -n ' rwhoisd
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
diff --git a/net/rwhoisd/pkg-descr b/net/rwhoisd/pkg-descr
deleted file mode 100644
index 18465350eed2..000000000000
--- a/net/rwhoisd/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-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.
-
-WWW: http://www.rwhois.net/
diff --git a/net/rwhoisd/pkg-plist b/net/rwhoisd/pkg-plist
deleted file mode 100644
index b408906ebb78..000000000000
--- a/net/rwhoisd/pkg-plist
+++ /dev/null
@@ -1,63 +0,0 @@
-etc/rc.d/rwhoisd.sh
-lib/rwhois/a.com/attribute_defs/asn.tmpl
-lib/rwhois/a.com/attribute_defs/contact.tmpl
-lib/rwhois/a.com/attribute_defs/domain.tmpl
-lib/rwhois/a.com/attribute_defs/guardian.tmpl
-lib/rwhois/a.com/attribute_defs/host.tmpl
-lib/rwhois/a.com/attribute_defs/org.tmpl
-lib/rwhois/a.com/attribute_defs/referral.tmpl
-lib/rwhois/a.com/data/asn/asn.txt
-lib/rwhois/a.com/data/contact/contact.txt
-lib/rwhois/a.com/data/domain/domain.txt
-lib/rwhois/a.com/data/guardian/guardian.txt
-lib/rwhois/a.com/data/host/host.txt
-lib/rwhois/a.com/data/org/org.txt
-lib/rwhois/a.com/data/referral/referral.txt
-lib/rwhois/a.com/schema
-lib/rwhois/a.com/soa
-lib/rwhois/bin/rwhois_deleter
-lib/rwhois/bin/rwhois_indexer
-lib/rwhois/net-10.0.0.0-8/attribute_defs/contact.tmpl
-lib/rwhois/net-10.0.0.0-8/attribute_defs/guardian.tmpl
-lib/rwhois/net-10.0.0.0-8/attribute_defs/host.tmpl
-lib/rwhois/net-10.0.0.0-8/attribute_defs/network.tmpl
-lib/rwhois/net-10.0.0.0-8/attribute_defs/referral.tmpl
-lib/rwhois/net-10.0.0.0-8/data/network/network.txt
-lib/rwhois/net-10.0.0.0-8/data/referral/referral.txt
-lib/rwhois/net-10.0.0.0-8/schema
-lib/rwhois/net-10.0.0.0-8/soa
-lib/rwhois/rwhoisd.allow
-lib/rwhois/rwhoisd.auth_area
-lib/rwhois/rwhoisd.conf
-lib/rwhois/rwhoisd.deny
-lib/rwhois/rwhoisd.dir
-lib/rwhois/rwhoisd.root
-lib/rwhois/rwhoisd.x.dir
-lib/rwhois/sbin/rwhoisd
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCSDIR%%/operations_guide.html
-%%PORTDOCS%%%%DOCSDIR%%/operations_guide.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc2167.txt
-%%PORTDOCS%%%%DOCSDIR%%/security.html
-%%PORTDOCS%%%%DOCSDIR%%/security.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/rwhois/sbin
-@dirrm lib/rwhois/net-10.0.0.0-8/data/referral
-@dirrm lib/rwhois/net-10.0.0.0-8/data/network
-@dirrm lib/rwhois/net-10.0.0.0-8/data
-@dirrm lib/rwhois/net-10.0.0.0-8/attribute_defs
-@dirrm lib/rwhois/net-10.0.0.0-8
-@dirrm lib/rwhois/bin
-@dirrm lib/rwhois/a.com/data/referral
-@dirrm lib/rwhois/a.com/data/org
-@dirrm lib/rwhois/a.com/data/host
-@dirrm lib/rwhois/a.com/data/guardian
-@dirrm lib/rwhois/a.com/data/domain
-@dirrm lib/rwhois/a.com/data/contact
-@dirrm lib/rwhois/a.com/data/asn
-@dirrm lib/rwhois/a.com/data
-@dirrm lib/rwhois/a.com/attribute_defs
-@dirrm lib/rwhois/a.com
-@dirrm lib/rwhois
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
deleted file mode 100644
index d880b79fd326..000000000000
--- a/net/samba3/Makefile
+++ /dev/null
@@ -1,392 +0,0 @@
-# New ports collection makefile for:	samba
-# Date created:				11th Feb 1995
-# Whom:					gpalmer
-#
-# $FreeBSD$
-#
-
-PORTNAME=	samba
-PORTVERSION=	3.0.3.p2
-PORTREVISION?=	1
-PORTEPOCH?=	1
-CATEGORIES?=	net
-MASTER_SITES=	${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR=	pre rc .
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
-
-MAINTAINER?=	timur@gnu.org
-COMMENT?=	A free SMB and CIFS client and server for UNIX
-
-CONFLICTS?=	ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.*
-
-USE_BZIP2=	yes
-USE_ICONV=	yes
-# directories
-VARDIR=		${DESTDIR}/var
-SAMBA_SPOOL?=	${VARDIR}/spool/samba
-SAMBA_LOGDIR=	${VARDIR}/log/samba
-SAMBA_RUNDIR=	${VARDIR}/run
-SAMBA_LOCKDIR=	${SAMBA_RUNDIR}/samba
-SAMBA_PRIVATE?=	${PREFIX}/private
-SAMBA_CONFDIR?=	${PREFIX}/etc
-SAMBA_SWATDIR=	${PREFIX}/share/swat
-SAMBA_LIBDIR=	${PREFIX}/lib
-RC_DIR?=	${SAMBA_CONFDIR}/rc.d
-SAMBA_CONFIG=	${SAMBA_CONFDIR}/smb.conf
-
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
-
-CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \
-		--localstatedir=${VARDIR} \
-		--with-configdir=${SAMBA_CONFDIR} \
-		--with-libdir=${SAMBA_LIBDIR}/samba \
-		--with-swatdir=${SAMBA_SWATDIR} \
-		--with-piddir=${SAMBA_RUNDIR} --with-lockdir=${SAMBA_LOCKDIR} \
-		--with-privatedir=${SAMBA_PRIVATE} \
-		--with-logfilebase=${SAMBA_LOGDIR} \
-		--with-manpages-langs=en
-
-CONFIGURE_ARGS+=--with-libiconv=${LOCALBASE}
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/source
-
-# SUBPORTS end here
-.if defined(SAMBA_SUBPORT)
-.include <bsd.port.mk>
-.else
-
-NO_LATEST_LINK=	yes
-INSTALLS_SHLIB=	yes
-USE_RC_SUBR=	yes
-USE_AUTOCONF_VER=	253
-
-OPTIONS=	CUPS		"With CUPS printing support" on \
-		LDAP		"With LDAP support" on \
-		ADS		"With Active Directory support" on \
-		WINBIND		"With WinBIND support" on \
-		ACL_SUPPORT	"With ACL support" off \
-		SYSLOG		"With Syslog support" off \
-		QUOTAS		"With Quota support" off \
-		UTMP		"With UTMP support" on \
-		MSDFS		"With MSDFS support" off \
-		SAM_XML		"With XML smbpasswd backend" off \
-		SAM_MYSQL	"With MYSQL smbpasswd backend" off \
-		SAM_PGSQL	"With PostgreSQL smbpasswd backend" off \
-		SAM_OLD_LDAP	"With Samba2.x LDAP smbpasswd backend" off \
-		PAM_SMBPASS	"With SMB PAM module" off \
-		CRACKLIB	"With Cracklib password verification" off \
-		PYTHON		"With Python experimental bindings" off \
-		POPT		"With installed POPT library" on
-
-.include <bsd.port.pre.mk>
-
-CONFIGURE_ARGS+=	--with-pam --with-readline --with-sendfile-support \
-			--with-libsmbclient
-
-.if defined(WITH_PYTHON)
-USE_PYTHON=		2.1+
-# Hack to make it work with OPTIONS. Breaks portlint
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-CONFIGURE_ARGS+=	--with-python
-PLIST_SUB+=		PYTHON="" \
-			PYTHON_VERSION=${PYTHON_VERSION}
-.else
-CONFIGURE_ARGS+=	--without-python
-PLIST_SUB+=		PYTHON="@comment "
-.endif
-
-.if defined(WITH_CUPS)
-LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
-CONFIGURE_ARGS+=	--enable-cups
-CUPS=			cups
-.else
-CONFIGURE_ARGS+=	--disable-cups
-CUPS=			""
-.endif
-
-.if defined(WITH_SYSLOG)
-CONFIGURE_ARGS+=	--with-syslog
-.else
-CONFIGURE_ARGS+=	--without-syslog
-.endif
-
-.if defined(WITH_QUOTAS)
-CONFIGURE_ARGS+=	--with-quotas
-.endif
-
-.if defined(WITHOUT_UTMP)
-CONFIGURE_ARGS+=	--without-utmp
-.endif
-
-.if defined(WITH_MSDFS)
-CONFIGURE_ARGS+=	--with-msdfs
-.endif
-
-.if !defined(WITHOUT_WINBIND)
-CONFIGURE_ARGS+=	--with-winbind
-PLIST_SUB+=		WINBIND=""
-.if ${OSVERSION} >= 500112
-WITH_WINBIND_NSS=	yes
-.endif
-.else
-CONFIGURE_ARGS+=	--without-winbind
-PLIST_SUB+=		WINBIND="@comment "
-.endif
-
-.if defined(WITH_WINBIND_NSS)
-PLIST_SUB+=		WINBIND_NSS=""
-.else
-PLIST_SUB+=		WINBIND_NSS="@comment "
-.endif
-
-.if !defined(WITHOUT_ADS)
-WANT_LDAP=		yes
-WANT_KRB5=		yes
-CONFIGURE_ARGS+=	--with-ads
-.else
-CONFIGURE_ARGS+=	--without-ads
-.endif
-
-.if !defined(WITHOUT_LDAP)
-WANT_LDAP=		yes
-.endif
-
-# SAM
-.if defined(WITH_SAM_XML)
-#USE_GNOME=		libxml2
-LIB_DEPENDS+=		xml2.5:${PORTSDIR}/textproc/libxml2
-CONFIGURE_ARGS+=	--with-xml-prefix=${LOCALBASE}
-WANT_EXPSAM_MODULES+=	xml
-PLIST_SUB+=		SAMXML=""
-.else
-PLIST_SUB+=		SAMXML="@comment "
-.endif
-
-.if defined(WITH_SAM_MYSQL)
-USE_MYSQL=		yes
-CONFIGURE_ARGS+=	--with-mysql-prefix=${LOCALBASE}
-WANT_EXPSAM_MODULES+=	mysql
-PLIST_SUB+=		SAMMYSQL=""
-.else
-PLIST_SUB+=		SAMMYSQL="@comment "
-.endif
-
-.if defined(WITH_SAM_PGSQL)
-LIB_DEPENDS+=		pq.3:${PORTSDIR}/databases/postgresql-client
-CONFIGURE_ARGS+=	--with-pgsql-prefix=${LOCALBASE}
-WANT_EXPSAM_MODULES+=	pgsql
-PLIST_SUB+=		SAMPGSQL=""
-.else
-PLIST_SUB+=		SAMPGSQL="@comment "
-.endif
-
-.if defined(WITH_SAM_OLD_LDAP)
-WANT_LDAP=		yes
-CONFIGURE_ARGS+=	--with-ldapsam
-.else
-CONFIGURE_ARGS+=	--without-ldapsam
-.endif
-
-.if defined(WANT_EXPSAM_MODULES) && !empty(WANT_EXPSAM_MODULES)
-WANT_EXPSAM_MODULES!=	${ECHO_CMD} ${WANT_EXPSAM_MODULES} | ${SED} -e 's/ /,/g'
-CONFIGURE_ARGS+=	--with-expsam=${WANT_EXPSAM_MODULES}
-.endif
-# SAM
-
-# Kerberos5 is necessary for ADS
-.if defined(WANT_KRB5)
-.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a)
-CONFIGURE_ARGS+=	--with-krb5=${KRB5_HOME}
-.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
-CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME}
-.elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(/usr/lib/libkrb5.a)
-CONFIGURE_ARGS+=	--with-krb5=${DESTDIR}/usr
-.else
-BUILD_DEPENDS+=		krb5-config:${PORTSDIR}/security/heimdal
-KRB5_PREFIX!=		krb5-config --prefix 2>/dev/null || true
-.if defined(KRB5_PREFIX) && !empty (KRB5_PREFIX)
-CONFIGURE_ARGS+=	--with-krb5=${KRB5_PREFIX}
-.else
-BROKEN=			"Kerberos5 is necessary for ADS support. Please, install either Heimdal or MIT-Kerberos"
-.endif
-.endif
-.else
-CONFIGURE_ARGS+=	--without-krb5
-.endif
-
-.if defined(WANT_LDAP)
-USE_OPENLDAP=		yes
-CONFIGURE_ARGS+=	--with-ldap
-.else
-CONFIGURE_ARGS+=	--without-ldap
-.endif
-
-.if defined(WITH_PAM_SMBPASS)
-CONFIGURE_ARGS+=	--with-pam_smbpass
-PLIST_SUB+=		SMBPASS=""
-.else
-CONFIGURE_ARGS+=	--without-pam_smbpass
-PLIST_SUB+=		SMBPASS="@comment "
-.endif
-
-.if defined(WITH_CRACKLIB)
-LIB_DEPENDS+=		crack.1:${PORTSDIR}/security/cracklib
-CONFIGURE_ARGS+=	--with-cracklib=${LOCALBASE}/libdata/cracklib/pw_dict
-.else
-CONFIGURE_ARGS+=	--without-cracklib
-.endif
-
-.if defined(WITH_ACL_SUPPORT)
-.if ${OSVERSION} < 500018
-BROKEN=			"Requires FreeBSD 5.x at least after 20010326"
-.else
-CONFIGURE_ARGS+=	--with-acl-support
-.endif
-.endif
-
-.if !defined(WITHOUT_POPT)
-LIB_DEPENDS+=		popt.0:${PORTSDIR}/devel/popt
-.else
-CONFIGURE_ARGS+=	--with-included-popt
-.endif
-
-MLINKS=		samba.7 Samba.7
-MAN1=		findsmb.1 nmblookup.1 log2pcap.1 rpcclient.1 \
-		smbget.1 smbcacls.1 smbclient.1 smbcontrol.1 smbsh.1 \
-		smbstatus.1 smbtar.1 testparm.1 testprns.1 vfstest.1 \
-		ntlm_auth.1 profiles.1 smbcquotas.1 smbtree.1
-MAN5=		lmhosts.5 smb.conf.5 smbpasswd.5
-MAN7=		samba.7
-MAN8=		nmbd.8 smbd.8 net.8 pdbedit.8 smbpasswd.8 smbspool.8 \
-		swat.8 tdbdump.8 tdbbackup.8
-.if !defined(WITHOUT_WINBIND)
-MAN1+=		wbinfo.1
-MAN8+=		winbindd.8
-.endif
-
-.if !defined(WITHOUT_WINBIND)
-WINBIND_FILTER=		${SED} -e 's|%%WINBIND%%||g'
-.else
-WINBIND_FILTER=		${GREP} -v '^%%WINBIND%%'
-.endif
-
-PLIST_SUB+=		RC_DIR=${RC_DIR} \
-			SAMBA_LOGDIR=${SAMBA_LOGDIR} \
-			SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
-
-RC_SCRIPTS_SUB=		PREFIX=${PREFIX} \
-			CUPS=${CUPS} \
-			RC_SUBR=${RC_SUBR} \
-			SAMBA_CONFDIR=${SAMBA_CONFDIR} \
-			SAMBA_CONFIG=${SAMBA_CONFIG} \
-			SAMBA_LOGDIR=${SAMBA_LOGDIR} \
-			SAMBA_RUNDIR=${SAMBA_RUNDIR} \
-			SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \
-			SAMBA_SPOOL=${SAMBA_SPOOL}
-
-pre-fetch:
-	@${ECHO_MSG} "===>  -------------------------------------------"
-	@${ECHO_MSG} "===>  Run 'make config' to (re)configure the port"
-	@${ECHO_MSG} "===>  -------------------------------------------"
-
-post-patch:
-	@${FIND} ${WRKSRC} -name CVS -o -name .cvsignore | ${XARGS} ${RM}
-
-post-install:
-.for sect in 1 5 7 8
-	@${MKDIR} ${MAN${sect}PREFIX}/man/man${sect}
-.for man in ${MAN${sect}}
-	@${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/${man} ${MAN${sect}PREFIX}/man/man${sect}
-.endfor
-.endfor
-	@${MKDIR} ${EXAMPLESDIR}
-	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/* ${EXAMPLESDIR}
-.if defined(WITH_PAM_SMBPASS)
-	@${MKDIR} ${EXAMPLESDIR}/pam_smbpass
-	@${CP} -Rp ${WRKSRC}/pam_smbpass/samples/* ${EXAMPLESDIR}/pam_smbpass
-.endif
-.if defined(WITH_PYTHON)
-	@${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages
-	@${CP} -R ${WRKSRC}/build/lib.*/samba ${PREFIX}/lib/${PYTHON_VERSION}/site-packages
-	@${MKDIR} ${EXAMPLESDIR}/python
-	@${CP} -Rp ${WRKSRC}/python/examples/* ${EXAMPLESDIR}/python
-.endif
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}	\
-	    ${FILESDIR}/samba.sh.sample | ${WINBIND_FILTER} > ${WRKDIR}/samba.sh
-	${INSTALL_SCRIPT} ${WRKDIR}/samba.sh ${RC_DIR}/samba.sh
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} 	\
-		${FILESDIR}/smb.conf.default > ${WRKDIR}/smb.conf.default
-	${INSTALL_DATA} ${WRKDIR}/smb.conf.default ${SAMBA_CONFIG}.default
-	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
-	# Spool
-	@test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} &&		\
-	    ${CHMOD} 1777 ${SAMBA_SPOOL} && ${CHOWN} root:wheel ${SAMBA_SPOOL}
-	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_SPOOL} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHMOD} 1777 ${SAMBA_SPOOL}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_SPOOL}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_SPOOL}" >> ${TMPPLIST}
-	# Logdir
-	@test -d ${SAMBA_LOGDIR} || ${MKDIR} ${SAMBA_LOGDIR} &&		\
-	    ${CHMOD} 0755 ${SAMBA_LOGDIR} && ${CHOWN} root:wheel ${SAMBA_LOGDIR}
-	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_LOGDIR} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHMOD} 0755 ${SAMBA_LOGDIR}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_LOGDIR}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_LOGDIR} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_LOGDIR}/* manually.\"" >> ${TMPPLIST}
-	# Lockdir
-	@test -d ${SAMBA_LOCKDIR} || ${MKDIR} ${SAMBA_LOCKDIR} &&	\
-	    ${CHMOD} 0755 ${SAMBA_LOCKDIR} && ${CHOWN} root:wheel ${SAMBA_LOCKDIR}
-	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_LOCKDIR} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHMOD} 0755 ${SAMBA_LOCKDIR}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_LOCKDIR}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_LOCKDIR}/printing" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec for file in `${LS} ${SAMBA_LOCKDIR} | ${GREP} -v '^winbindd_'`; do ${RM} -rf ${SAMBA_LOCKDIR}/${file}; done" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_LOCKDIR} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_LOCKDIR}/* manually.\"" >> ${TMPPLIST}
-	# Private
-	@test -d ${SAMBA_PRIVATE} || ${MKDIR} ${SAMBA_PRIVATE} &&	\
-	    ${CHMOD} 700 ${SAMBA_PRIVATE} && ${CHOWN} root:wheel ${SAMBA_PRIVATE}
-	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_PRIVATE} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHMOD} 700 ${SAMBA_PRIVATE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_PRIVATE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_PRIVATE} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_PRIVATE}/* manually.\"" >> ${TMPPLIST}
-.if !defined(WITHOUT_WINBIND)
-.if defined(WITH_WINBIND_NSS)
-	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_winbind.so ${SAMBA_LIBDIR}/nss_winbind.so.1
-	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_wins.so ${SAMBA_LIBDIR}/nss_wins.so.1
-.endif
-	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/pam_winbind.so ${SAMBA_LIBDIR}
-.endif
-.if defined(WITH_PAM_SMBPASS)
-	@${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_smbpass.so ${SAMBA_LIBDIR}
-.endif
-	-@${LN} -snf libsmbclient.so.0 ${SAMBA_LIBDIR}/libsmbclient.so
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}
-	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/THANKS		\
-			${WRKDIR}/${DISTNAME}/docs/history ; do		\
-		${INSTALL_DATA} $$i ${DOCSDIR} ;			\
-	done
-	for i in faq Registry htmldocs htmldocs/images ; do		\
-		${MKDIR} ${DOCSDIR}/$$i ;				\
-		for j in ${WRKDIR}/${DISTNAME}/docs/$$i/* ; do		\
-		    if [ -f $$j ]; then					\
-		    	${INSTALL_DATA} $$j ${DOCSDIR}/$$i ;		\
-		    fi; 						\
-		done							\
-	done
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
-
-.endif
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
deleted file mode 100644
index 9027a722700f..000000000000
--- a/net/samba3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (samba-3.0.3pre2.tar.bz2) = 47464715c375bf4b17453dc534337111
-SIZE (samba-3.0.3pre2.tar.bz2) = 9347649
diff --git a/net/samba3/files/README.FreeBSD b/net/samba3/files/README.FreeBSD
deleted file mode 100644
index 5bc20d291549..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. Put string 'samba_enable="YES"' into your /etc/rc.conf.
-3. Type '/usr/local/etc/rc.d/samba.sh start' 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-devel port maintainer: Timur Bakeyev <timur@gnu.org>
diff --git a/net/samba3/files/patch-Makefile.in b/net/samba3/files/patch-Makefile.in
deleted file mode 100644
index efeaa5e5b20e..000000000000
--- a/net/samba3/files/patch-Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
---- Makefile.in.orig	Sun Apr  4 09:37:15 2004
-+++ Makefile.in	Mon Apr  5 20:43:42 2004
-@@ -101,6 +101,7 @@
- LIBSMBCLIENT_MAJOR=0
- LIBSMBCLIENT_MINOR=1
- 
-+NSS_VERSION=1
- 
- FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper  -I. $(CPPFLAGS) -I$(srcdir)
- FLAGS2 = 
-@@ -957,8 +958,8 @@
- 		@SONAMEFLAG@`basename $@`
- 
- bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
--	@echo Linking libsmbclient shared library $@
--	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+	@echo Linking libsmbclient shared library $@.$(LIBSMBCLIENT_MAJOR)
-+	@$(SHLD) $(LDSHFLAGS) -o $@.$(LIBSMBCLIENT_MAJOR) $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS) \
- 		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
- 
-@@ -1041,13 +1042,13 @@
- @WINBIND_NSS@: $(WINBIND_NSS_PICOBJS)
- 	@echo "Linking $@"
- 	@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \
--		@WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`
-+		@WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`.$(NSS_VERSION)
- 
- @WINBIND_WINS_NSS@: $(WINBIND_WINS_NSS_PICOBJS)
- 	@echo "Linking $@"
- 	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_PICOBJS) \
- 		$(LDAP_LIBS) $(KRB5LIBS) -lc \
--		@SONAMEFLAG@`basename $@`
-+		@SONAMEFLAG@`basename $@`.$(NSS_VERSION)
- 
- nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
- 	@echo "Linking $@"
-@@ -1218,7 +1219,7 @@
- 
- bin/t_snprintf@EXEEXT@: lib/snprintf.c
- 	$(CC) $(FLAGS) -o $@ -DTEST_SNPRINTF lib/snprintf.c -lm
--install: installbin installman installscripts installdat installswat installmodules @INSTALLCLIENT@
-+install: installbin installscripts installdat installswat installmodules @INSTALLCLIENT@
- 
- install-everything: install installmodules
- 
-@@ -1270,7 +1271,7 @@
- 
- installclientlib: installdirs libsmbclient
- 	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/lib
--	-$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)${prefix}/lib
-+	-$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@.$(LIBSMBCLIENT_MAJOR) $(DESTDIR)${prefix}/lib
- 	-$(INSTALLCLIENTCMD_A) bin/libsmbclient.a $(DESTDIR)${prefix}/lib
- 	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/include
- 	-$(INSTALLCMD) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include
diff --git a/net/samba3/files/patch-aclocal.m4 b/net/samba3/files/patch-aclocal.m4
deleted file mode 100644
index 36c172411d1e..000000000000
--- a/net/samba3/files/patch-aclocal.m4
+++ /dev/null
@@ -1,104 +0,0 @@
---- aclocal.m4.orig	Sat Apr  3 22:30:01 2004
-+++ aclocal.m4	Sat Apr  3 22:33:24 2004
-@@ -564,89 +564,20 @@
-     jm_cv_lib_iconv=""
-     jm_cv_giconv=no
-     jm_save_LIBS="$LIBS"
--    LIBS="$LIBS -lbiconv"
--    AC_TRY_LINK([#include <stdlib.h>
--#include <biconv.h>],
--        [iconv_t cd = iconv_open("","");
--         iconv(cd,NULL,NULL,NULL,NULL);
--         iconv_close(cd);],
--      jm_cv_func_iconv=yes
--      jm_cv_biconv=yes
--      jm_cv_include="biconv.h"
--      jm_cv_lib_iconv="biconv")
--      LIBS="$jm_save_LIBS"
--
--    dnl Check for include in funny place but no lib needed
--    if test "$jm_cv_func_iconv" != yes; then 
--      AC_TRY_LINK([#include <stdlib.h>
--#include <giconv.h>],
--        [iconv_t cd = iconv_open("","");
--         iconv(cd,NULL,NULL,NULL,NULL);
--         iconv_close(cd);],
--         jm_cv_func_iconv=yes
--         jm_cv_include="giconv.h"
--         jm_cv_giconv="yes"
--         jm_cv_lib_iconv="")
--
--      dnl Standard iconv.h include, lib in glibc or libc ...
--      if test "$jm_cv_func_iconv" != yes; then
--        AC_TRY_LINK([#include <stdlib.h>
-+    LIBS="$LIBS -liconv"
-+  AC_TRY_LINK([#include <stdlib.h>
- #include <iconv.h>],
--          [iconv_t cd = iconv_open("","");
--           iconv(cd,NULL,NULL,NULL,NULL);
--           iconv_close(cd);],
--           jm_cv_include="iconv.h"
--           jm_cv_func_iconv=yes
--           jm_cv_lib_iconv="")
--
--          if test "$jm_cv_lib_iconv" != yes; then
--            jm_save_LIBS="$LIBS"
--            LIBS="$LIBS -lgiconv"
--            AC_TRY_LINK([#include <stdlib.h>
--#include <giconv.h>],
--              [iconv_t cd = iconv_open("","");
--               iconv(cd,NULL,NULL,NULL,NULL);
--               iconv_close(cd);],
--              jm_cv_lib_iconv=yes
--              jm_cv_func_iconv=yes
--              jm_cv_include="giconv.h"
--              jm_cv_giconv=yes
--              jm_cv_lib_iconv="giconv")
--
--           LIBS="$jm_save_LIBS"
--
--        if test "$jm_cv_func_iconv" != yes; then
--          jm_save_LIBS="$LIBS"
--          LIBS="$LIBS -liconv"
--          AC_TRY_LINK([#include <stdlib.h>
--#include <iconv.h>],
--            [iconv_t cd = iconv_open("","");
--             iconv(cd,NULL,NULL,NULL,NULL);
--             iconv_close(cd);],
--            jm_cv_include="iconv.h"
--            jm_cv_func_iconv=yes
--            jm_cv_lib_iconv="iconv")
--          LIBS="$jm_save_LIBS"
--        fi
--      fi
--    fi
--  fi
-+    [iconv_t cd = iconv_open("","");
-+     iconv(cd,NULL,NULL,NULL,NULL);
-+     iconv_close(cd);],
-+    jm_cv_include="iconv.h"
-+    jm_cv_func_iconv=yes
-+    jm_cv_lib_iconv="iconv")
-+    LIBS="$jm_save_LIBS"
-   if test "$jm_cv_func_iconv" = yes; then
--    if test "$jm_cv_giconv" = yes; then
--      AC_DEFINE(HAVE_GICONV, 1, [What header to include for iconv() function: giconv.h])
--      AC_MSG_RESULT(yes)
--      ICONV_FOUND=yes
--    else
--      if test "$jm_cv_biconv" = yes; then
--        AC_DEFINE(HAVE_BICONV, 1, [What header to include for iconv() function: biconv.h])
--        AC_MSG_RESULT(yes)
--        ICONV_FOUND=yes
--      else 
--        AC_DEFINE(HAVE_ICONV, 1, [What header to include for iconv() function: iconv.h])
--        AC_MSG_RESULT(yes)
--        ICONV_FOUND=yes
--      fi
--    fi
-+    AC_DEFINE(HAVE_ICONV, 1, [What header to include for iconv() function: iconv.h])
-+    AC_MSG_RESULT(yes)
-+    ICONV_FOUND=yes
-   else
-     AC_MSG_RESULT(no)
-   fi
diff --git a/net/samba3/files/patch-aj b/net/samba3/files/patch-aj
deleted file mode 100644
index 8804493c38df..000000000000
--- a/net/samba3/files/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/local.h.orig	Fri Jul  6 03:01:26 2001
-+++ include/local.h	Tue Oct 16 17:20:36 2001
-@@ -176,10 +176,10 @@
-  * 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
- 
- /* maximum ID number used for session control. This cannot be larger
-    than 62*62 for the current code */
diff --git a/net/samba3/files/patch-configure.in b/net/samba3/files/patch-configure.in
deleted file mode 100644
index 88a46040b022..000000000000
--- a/net/samba3/files/patch-configure.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.in.orig	Sun Apr  4 09:37:25 2004
-+++ configure.in	Mon Apr  5 21:21:58 2004
-@@ -2983,7 +2983,6 @@
- 
- 
- dictpath="/usr/lib/cracklib_dict"
--with_cracklib=yes
- ###############################################
- # test for where we get FaciestCheck from
- AC_MSG_CHECKING(where to use cracklib from (default=$dictpath))
-@@ -4118,6 +4117,8 @@
- 		# the Linux version.
- 		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
- 		    nsswitch/winbind_nss_linux.o"
-+		WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
-+		WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
- 		;;
- 	*irix*)
- 		# IRIX has differently named shared libraries
diff --git a/net/samba3/files/patch-python_setup.py b/net/samba3/files/patch-python_setup.py
deleted file mode 100644
index fb7a58cf43d9..000000000000
--- a/net/samba3/files/patch-python_setup.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- python/setup.py.orig	Thu Mar  4 05:28:18 2004
-+++ python/setup.py	Thu Mar  4 05:29:35 2004
-@@ -57,6 +57,9 @@
-     if lib[0:2] == "-L":
-         library_dirs.append(lib[2:])
-         continue
-+    if lib[0:2] == "-W":
-+	# Skip linker flags
-+	continue
-     print "Unknown entry '%s' in $LIBS variable passed to setup.py" % lib
-     sys.exit(1)
- 
diff --git a/net/samba3/files/patch-script_installbin.sh b/net/samba3/files/patch-script_installbin.sh
deleted file mode 100644
index 66a0577eeb16..000000000000
--- a/net/samba3/files/patch-script_installbin.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- script/installbin.sh.orig	Tue Mar  9 15:33:32 2004
-+++ script/installbin.sh	Tue Mar  9 15:35:43 2004
-@@ -17,8 +17,7 @@
-  p2=`basename $p`
-  echo Installing $p as $BINDIR/$p2
-  if [ -f $BINDIR/$p2 ]; then
--   rm -f $BINDIR/$p2.old
--   mv $BINDIR/$p2 $BINDIR/$p2.old
-+   rm -f $BINDIR/$p2 $BINDIR/$p2.old
-  fi
-  cp $p $BINDIR/
-  chmod $INSTALLPERMS $BINDIR/$p2
diff --git a/net/samba3/files/patch-script_installscripts.sh b/net/samba3/files/patch-script_installscripts.sh
deleted file mode 100644
index 4091df6c4290..000000000000
--- a/net/samba3/files/patch-script_installscripts.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- script/installscripts.sh.orig	Tue Mar  9 15:35:54 2004
-+++ script/installscripts.sh	Tue Mar  9 15:36:38 2004
-@@ -25,8 +25,7 @@
-   p2=`basename $p`
-   echo Installing $BINDIR/$p2
-   if [ -f $BINDIR/$p2 ]; then
--    rm -f $BINDIR/$p2.old
--    mv $BINDIR/$p2 $BINDIR/$p2.old
-+    rm -f $BINDIR/$p2 $BINDIR/$p2.old
-   fi
-   cp $p $BINDIR/
-   chmod $INSTALLPERMS $BINDIR/$p2
diff --git a/net/samba3/files/patch-smbd_chgpasswd.c b/net/samba3/files/patch-smbd_chgpasswd.c
deleted file mode 100644
index 104ead0ff325..000000000000
--- a/net/samba3/files/patch-smbd_chgpasswd.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- smbd/chgpasswd.c.orig	Mon Apr  5 21:33:21 2004
-+++ smbd/chgpasswd.c	Mon Apr  5 21:33:34 2004
-@@ -49,7 +49,6 @@
- #include "includes.h"
- 
- #ifdef HAVE_WORKING_CRACKLIB
--#include <crack.h>
- 
- #ifndef HAVE_CRACKLIB_DICTPATH
- #ifndef CRACKLIB_DICTPATH
diff --git a/net/samba3/files/patch-tests_crack.c b/net/samba3/files/patch-tests_crack.c
deleted file mode 100644
index 6d62851c7d7d..000000000000
--- a/net/samba3/files/patch-tests_crack.c
+++ /dev/null
@@ -1,8 +0,0 @@
---- tests/crack.c.orig	Sat Apr  3 18:04:05 2004
-+++ tests/crack.c	Sat Apr  3 01:12:18 2004
-@@ -1,5 +1,3 @@
--#include <crack.h>
--
- #ifndef HAVE_CRACKLIB_DICTPATH
- #ifndef CRACKLIB_DICTPATH
- #define CRACKLIB_DICTPATH SAMBA_CRACKLIB_DICTPATH
diff --git a/net/samba3/files/samba.sh.sample b/net/samba3/files/samba.sh.sample
deleted file mode 100644
index c37ba55de080..000000000000
--- a/net/samba3/files/samba.sh.sample
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: nmbd smbd
-%%WINBIND%%# PROVIDE: winbindd
-# REQUIRE: NETWORKING SERVERS named %%CUPS%%
-# BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable samba:
-#
-#samba_enable="YES"
-#
-# or, for fine grain control
-#
-#nmbd_enable="YES"
-#smbd_enable="YES"
-%%WINBIND%%#winbindd_enable="YES"
-#
-
-. %%RC_SUBR%%
-
-name=samba
-rcvar=`set_rcvar`
-
-load_rc_config $name
-# Set defaults
-samba_config=${samba_config:-"%%SAMBA_CONFIG%%"}
-# Config file is required
-if [ ! -r ${samba_config} ]; then
-    warn "${samba_config} is not readable."
-    case $1 in
-	force*) : ;;
-	*) exit 1 ;;
-    esac
-fi
-
-if test -n ${samba_enable:-""} && checkyesno samba_enable; then
-    nmbd_enable=${nmbd_enable:-"YES"}
-    smbd_enable=${smbd_enable:-"YES"}
-%%WINBIND%%    winbindd_enable=${winbindd_enable:-"YES"}
-%%WINBIND%%    # Check, that winbind is actally configured
-%%WINBIND%%    if [ ! "`egrep -i '(idmap.*uid|winbind.*uid)' ${samba_config} 2>/dev/null | egrep -v [\#\;]`" ]; then
-%%WINBIND%%    	#warn "Winbind support is not configured"
-%%WINBIND%%	winbindd_enable="NO"
-%%WINBIND%%    fi
-fi
-
-# Hack until run_rc_command() get rid of exit()
-samba_stop() {
-    pid=$(check_pidfile ${pidfile} ${command})
-    if [ -z ${pid} ]; then
-	echo "${name} not running? (check ${pidfile})."
-	return 1
-    fi
-    echo "Stopping ${command}."
-    kill -${sig_stop:-TERM} ${pid}
-    [ $? -ne 0 ] && [ -z "$rc_force" ] && return 1
-    wait_for_pids ${pid}
-}
-
-nmbd_precmd() {
-    # XXX: Never delete winbindd_idmap.tdb and winbindd_cache.tdb
-    if [ -d "%%SAMBA_LOCKDIR%%" ]; then
-	echo "Starting SAMBA: removing stale tdbs :"
-	for file in connections.tdb locking.tdb messages.tdb \
-		    sessionid.tdb unexpected.tdb brlock.tdb \
-		    namelist.debug
-	do
-	    rm -vf "%%SAMBA_LOCKDIR%%/$file"
-	done
-    fi
-}
-
-# nmbd
-name=nmbd
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/${name}"
-required_dirs="%%SAMBA_LOCKDIR%%"
-pidfile=%%SAMBA_RUNDIR%%/${name}.pid
-start_precmd="nmbd_precmd"
-stop_cmd="samba_stop"
-# Defaults
-nmbd_enable=${nmbd_enable:-"NO"}
-nmbd_flags=${nmbd_flags:-"-D"}
-command_args="${nmbd_flags} -s ${samba_config}"
-
-load_rc_config $name
-run_rc_command "$1"
-
-# smbd
-name=smbd
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/${name}"
-pidfile=%%SAMBA_RUNDIR%%/${name}.pid
-start_precmd=":"
-stop_cmd="samba_stop"
-# Defaults
-smbd_enable=${smbd_enable:-"NO"}
-smbd_flags=${smbd_flags:-"-D"}
-command_args="${smbd_flags} -s ${samba_config}"
-
-load_rc_config $name
-run_rc_command "$1"
-%%WINBIND%%
-%%WINBIND%%# winbindd
-%%WINBIND%%name=winbindd
-%%WINBIND%%rcvar=`set_rcvar`
-%%WINBIND%%command="%%PREFIX%%/sbin/${name}"
-%%WINBIND%%required_dirs="%%SAMBA_LOCKDIR%%"
-%%WINBIND%%pidfile=%%SAMBA_RUNDIR%%/${name}.pid
-%%WINBIND%%start_precmd=":"
-%%WINBIND%%stop_cmd="samba_stop"
-%%WINBIND%%# Defaults
-%%WINBIND%%winbindd_enable=${winbindd_enable:-"NO"}
-%%WINBIND%%winbindd_flags=${winbindd_flags:-""}
-%%WINBIND%%command_args="${winbindd_flags} -s ${samba_config}"
-%%WINBIND%%
-%%WINBIND%%load_rc_config $name
-%%WINBIND%%run_rc_command "$1"
diff --git a/net/samba3/files/smb.conf.default b/net/samba3/files/smb.conf.default
deleted file mode 100644
index 884ae9bef071..000000000000
--- a/net/samba3/files/smb.conf.default
+++ /dev/null
@@ -1,277 +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
-#
-# For a step by step guide on installing, configuring and using Samba, 
-# read the Samba HOWTO Collection.
-#
-# 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 made 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
-
-# Security mode. Defines in which mode Samba will operate. Possible 
-# values are share, user, server, domain and ads. Most people will want 
-# user level security. See the HOWTO Collection for details.
-   security = user
-
-# 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, cups, sysv, plp, lprng, aix, hpux, qnx
-;   printing = cups
-
-# 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
-
-# Use password server option only with security = server
-# The argument list may include:
-#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
-# or to auto-locate the domain controller/s
-#   password server = *
-;   password server = <NT-Server-Name>
-
-# Use the realm option only with security = ads
-# Specifies the Active Directory realm the host is part of
-;   realm = MY_REALM
-
-# Backend to store user information in. New installations should 
-# use either tdbsam or ldapsam. smbpasswd is available for backwards 
-# compatibility. tdbsam requires no further configuration.
-;   passdb backend = tdbsam
-
-# 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.
-# Note: Consider carefully the location in the configuration file of
-#       this line.  The included file is read at that point.
-;   include = %%SAMBA_CONFDIR%%/smb.conf.%m
-
-# Most people will find that this option gives better performance.
-# See the chapter 'Samba performance issues' in the Samba HOWTO Collection
-# and the manual pages for details.
-# You may want to add the following on a Linux system:
-#         SO_RCVBUF=8192 SO_SNDBUF=8192
-   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
-
-# 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 default is NO.
-   dns proxy = no 
-
-# charset settings
-;   display charset = ASCII
-;   unix charset = ASCII
-;   dos charset = ASCII
-
-# These scripts are used on a domain controller or stand-alone 
-# machine to add or delete corresponding unix accounts
-;  add user script = /usr/sbin/useradd %u
-;  add group script = /usr/sbin/groupadd %g
-;  add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
-;  delete user script = /usr/sbin/userdel %u
-;  delete user from group script = /usr/sbin/deluser %u %g
-;  delete group script = /usr/sbin/groupdel %g
-
-#============================ Share Definitions ==============================
-[homes]
-   comment = Home Directories
-   browseable = no
-   writable = 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
-;   writable = 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
-   writable = 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
-;   writable = 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
-;   writable = 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
-;   writable = 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
-;  writable = 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 writable 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
-;   writable = 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 writable 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
-;   writable = yes
-;   printable = no
-;   create mask = 0765
-
-
diff --git a/net/samba3/pkg-descr b/net/samba3/pkg-descr
deleted file mode 100644
index b49d3d9ac57c..000000000000
--- a/net/samba3/pkg-descr
+++ /dev/null
@@ -1,12 +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.
-
-WWW: http://www.samba.org/
diff --git a/net/samba3/pkg-message b/net/samba3/pkg-message
deleted file mode 100644
index 1eaf5aeb529e..000000000000
--- a/net/samba3/pkg-message
+++ /dev/null
@@ -1,18 +0,0 @@
-******************************************************************************
-Starting from Samba 3.0.3 this port doesn't create 'smbpasswd' file
-automatically. Users are encouraged to use 'tdbsam' backend instead:
-
-  [global]
-    passdb backend = tdbsam, smbpasswd
-
-You can use pdbedit to migrate accounts from 'smbpasswd' to 'tdbsam',
-see the Samba-HOWTO-Collection.
-
-You still can create 'smbpasswd' file with the supplied 'make_smbpasswd'
-script:
-
-  cat /etc/passwd | grep -v "^#" | make_smbpasswd > smbpasswd
-  chmod 600 smbpasswd
-
-But the usage of it is deprecated.
-******************************************************************************
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
deleted file mode 100644
index d4bb1f250d2d..000000000000
--- a/net/samba3/pkg-plist
+++ /dev/null
@@ -1,726 +0,0 @@
-bin/findsmb
-bin/make_smbpasswd
-bin/net
-bin/nmblookup
-bin/ntlm_auth
-bin/pdbedit
-bin/profiles
-bin/rpcclient
-bin/smbcacls
-bin/smbclient
-bin/smbcontrol
-bin/smbcquotas
-bin/smbpasswd
-bin/smbspool
-bin/smbstatus
-bin/smbtar
-bin/smbtree
-bin/tdbbackup
-bin/tdbdump
-bin/testparm
-bin/testprns
-%%WINBIND%%bin/wbinfo
-@unexec %D/etc/rc.d/samba.sh forcestop 2>/dev/null || true
-etc/rc.d/samba.sh
-@unexec if cmp -s %D/etc/smb.conf %D/etc/smb.conf.default; then rm -f %D/etc/smb.conf; fi
-etc/smb.conf.default
-sbin/smbd
-sbin/nmbd
-sbin/swat
-%%WINBIND%%sbin/winbindd
-include/libsmbclient.h
-lib/samba/lowcase.dat
-lib/samba/upcase.dat
-lib/samba/valid.dat
-lib/samba/de.msg
-lib/samba/en.msg
-lib/samba/fr.msg
-lib/samba/it.msg
-lib/samba/ja.msg
-lib/samba/nl.msg
-lib/samba/pl.msg
-lib/samba/tr.msg
-lib/samba/vfs/audit.so
-lib/samba/vfs/cap.so
-lib/samba/vfs/default_quota.so
-lib/samba/vfs/expand_msdfs.so
-lib/samba/vfs/extd_audit.so
-lib/samba/vfs/fake_perms.so
-lib/samba/vfs/netatalk.so
-lib/samba/vfs/readonly.so
-lib/samba/vfs/recycle.so
-lib/samba/charset/CP437.so
-lib/samba/charset/CP850.so
-%%SAMMYSQL%%lib/samba/pdb/mysql.so
-%%SAMPGSQL%%lib/samba/pdb/pgsql.so
-%%SAMXML%%lib/samba/pdb/xml.so
-lib/libsmbclient.a
-lib/libsmbclient.so
-lib/libsmbclient.so.0
-%%WINBIND_NSS%%lib/nss_winbind.so.1
-%%WINBIND_NSS%%lib/nss_wins.so.1
-%%WINBIND%%lib/pam_winbind.so
-%%SMBPASS%%lib/pam_smbpass.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/__init__.py
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/lsa.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/printerdata.py
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/samr.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/smb.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/spoolss.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/srvsvc.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/tdb.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/tdbpack.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/winbind.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/winreg.so
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/Manifest
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
-%%PORTDOCS%%%%DOCSDIR%%/Read-Manifest-Now
-%%PORTDOCS%%%%DOCSDIR%%/Roadmap
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/WHATSNEW.txt
-%%PORTDOCS%%%%DOCSDIR%%/history
-%%PORTDOCS%%%%DOCSDIR%%/faq/FAQ-ClientApp.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/FAQ-Install.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/FAQ-errors.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/FAQ-features.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/FAQ-general.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/samba-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/AccessControls.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/AdvancedNetworkManagement.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Appendixes.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Backup.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/CUPS-printing.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/ClientConfig.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/DNSDHCP.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/FastStart.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Further-Resources.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/InterdomainTrusts.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/IntroSMB.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/NT4Migration.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/NetworkBrowsing.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Other-Clients.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/PolicyMgmt.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Portability.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/ProfileMgmt.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/SWAT.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Samba-Developers-Guide.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Samba-HOWTO-Collection.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/SambaHA.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/ServerType.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/StandAloneServer.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/VFS.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/bugreport.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/compiling.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/diagnosis.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/domain-member.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/editreg.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/findsmb.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/groupmapping.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/index.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/install.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/integrate-ms-networks.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/ix01.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/lmhosts.5.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/locking.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/log2pcap.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/migration.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/mount.cifs.8.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/msdfs.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/net.8.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/nmbd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/nmblookup.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/ntlm_auth.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/optional.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/pam.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/passdb.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/pdbedit.8.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/pr01.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/pr02.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/printing.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/problems.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/profiles.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/rpcclient.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/samba-bdc.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/samba-pdc.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/samba.7.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/samba.css
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/securing-samba.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smb.conf.5.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbcacls.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbclient.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbcontrol.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbcquotas.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbget.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbmnt.8.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbmount.8.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbpasswd.5.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbpasswd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbsh.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbspool.8.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbstatus.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbtar.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbtree.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbumount.8.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/speed.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/swat.8.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/tdbbackup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/tdbdump.8.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/testparm.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/testprns.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/troubleshooting.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/type.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/unicode.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/upgrading-to-3.0.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/vfstest.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/wbinfo.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/winbind.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/winbindd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/10small.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/11small.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/12small.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/13small.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/14small.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/1small.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/2small.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/3small.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/4small.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/5small.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/6small.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/7small.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/8small.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/9small.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/a_small.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/access1.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/browsing1.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/cups1.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/cups2.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/domain.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/ethereal1.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/ethereal2.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/idmap-gid2sid.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/idmap-groups.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/idmap-sid2gid.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/idmap-sid2uid.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/idmap-store-gid2sid.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/idmap-uid2sid.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/idmap.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/idmap_winbind_no_loop.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/pdftoepsonusb.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/pdftosocket.png
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/trusts1.png
-%%PORTDOCS%%%%DOCSDIR%%/Registry/FolderRedir.adm
-%%PORTDOCS%%%%DOCSDIR%%/Registry/NT4-Locking.reg
-%%PORTDOCS%%%%DOCSDIR%%/Registry/NT4_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/Registry/Win-2Kx-XPP-DeleteCachedProfiles.reg
-%%PORTDOCS%%%%DOCSDIR%%/Registry/Win-2Kx-XPP-ForceLocalProfile.reg
-%%PORTDOCS%%%%DOCSDIR%%/Registry/Win-NT-DeleteRoamingProfile.reg
-%%PORTDOCS%%%%DOCSDIR%%/Registry/Win2000_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/Registry/Win95_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/Registry/Win98_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/Registry/Win9X-CacheHandling.reg
-%%PORTDOCS%%%%DOCSDIR%%/Registry/WinME_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/Registry/WinXP_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/Registry/WinXP_SignOrSeal.reg
-%%PORTDOCS%%%%DOCSDIR%%/Registry/WindowsTerminalServer.reg
-%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/README
-%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/kdc-pdc
-%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-mature
-%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-migration
-%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-sync
-%%PYTHON%%%%EXAMPLESDIR%%/python/tdbpack/oldtdbutil.py
-%%PYTHON%%%%EXAMPLESDIR%%/python/tdbpack/tdbtimetrial.py
-%%PYTHON%%%%EXAMPLESDIR%%/python/tdbpack/test_tdbpack.py
-%%PYTHON%%%%EXAMPLESDIR%%/python/spoolss/changeid.py
-%%PYTHON%%%%EXAMPLESDIR%%/python/spoolss/enumprinters.py
-%%PYTHON%%%%EXAMPLESDIR%%/python/spoolss/psec.py
-%%EXAMPLESDIR%%/pdb/Makefile
-%%EXAMPLESDIR%%/pdb/README
-%%EXAMPLESDIR%%/pdb/mysql/mysql.dump
-%%EXAMPLESDIR%%/pdb/mysql/smb.conf
-%%EXAMPLESDIR%%/pdb/pdb_test.c
-%%EXAMPLESDIR%%/pdb/sambapdb.dtd
-%%EXAMPLESDIR%%/validchars/msdos70.out
-%%EXAMPLESDIR%%/validchars/nwdos70.out
-%%EXAMPLESDIR%%/validchars/readme
-%%EXAMPLESDIR%%/validchars/validchr.c
-%%EXAMPLESDIR%%/validchars/validchr.com
-%%EXAMPLESDIR%%/tridge/README
-%%EXAMPLESDIR%%/tridge/smb.conf
-%%EXAMPLESDIR%%/tridge/smb.conf.WinNT
-%%EXAMPLESDIR%%/tridge/smb.conf.fjall
-%%EXAMPLESDIR%%/tridge/smb.conf.lapland
-%%EXAMPLESDIR%%/tridge/smb.conf.vittjokk
-%%EXAMPLESDIR%%/thoralf/smb.conf
-%%EXAMPLESDIR%%/svr4-startup/samba.server
-%%EXAMPLESDIR%%/svr4-startup/README
-%%EXAMPLESDIR%%/LDAP/README
-%%EXAMPLESDIR%%/LDAP/convertSambaAccount
-%%EXAMPLESDIR%%/LDAP/ldapsync.pl
-%%EXAMPLESDIR%%/LDAP/samba-nds.schema
-%%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds4.x
-%%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds5.x
-%%EXAMPLESDIR%%/LDAP/samba-schema.IBMSecureWay
-%%EXAMPLESDIR%%/LDAP/samba.schema
-%%EXAMPLESDIR%%/LDAP/samba.schema.at.IBM-DS
-%%EXAMPLESDIR%%/LDAP/samba.schema.oc.IBM-DS
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/CONTRIBUTORS
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/COPYING
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/ChangeLog
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/FILES
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/INFRASTRUCTURE
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/INSTALL
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/Makefile
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/README
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/TODO
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/cgi/README
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/cgi/ldappass.cgi
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/Makefile
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/getopt.c
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/getopt.h
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/md4.c
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/mkntpwd.c
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/mkntpwd.h
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/smbdes.c
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupadd.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupdel.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupmod.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupshow.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-migrate-accounts.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-migrate-groups.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-passwd.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-populate.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-tools.spec
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-useradd.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-userdel.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-usermod.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-usershow.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap_conf.pm
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap_tools.pm
-%%EXAMPLESDIR%%/simple/README
-%%EXAMPLESDIR%%/simple/smb.conf
-%%EXAMPLESDIR%%/printing/prtpub.c
-%%EXAMPLESDIR%%/printing/readme.prtpub
-%%EXAMPLESDIR%%/printing/smbprint
-%%EXAMPLESDIR%%/printing/smbprint-new.sh
-%%EXAMPLESDIR%%/printing/smbprint.sysv
-%%EXAMPLESDIR%%/printer-accounting/README
-%%EXAMPLESDIR%%/printer-accounting/acct-all
-%%EXAMPLESDIR%%/printer-accounting/acct-sum
-%%EXAMPLESDIR%%/printer-accounting/hp5-redir
-%%EXAMPLESDIR%%/printer-accounting/lp-acct
-%%EXAMPLESDIR%%/printer-accounting/printcap
-%%EXAMPLESDIR%%/VFS/Makefile.in
-%%EXAMPLESDIR%%/VFS/README
-%%EXAMPLESDIR%%/VFS/autogen.sh
-%%EXAMPLESDIR%%/VFS/configure.in
-%%EXAMPLESDIR%%/VFS/install-sh
-%%EXAMPLESDIR%%/VFS/shadow_copy_test.c
-%%EXAMPLESDIR%%/VFS/skel_opaque.c
-%%EXAMPLESDIR%%/VFS/skel_transparent.c
-%%EXAMPLESDIR%%/ntlogon/README
-%%EXAMPLESDIR%%/ntlogon/ntlogon.conf
-%%EXAMPLESDIR%%/ntlogon/ntlogon.py
-%%EXAMPLESDIR%%/wins_hook/README
-%%EXAMPLESDIR%%/wins_hook/dns_update
-%%EXAMPLESDIR%%/misc/extra_smbstatus
-%%EXAMPLESDIR%%/misc/modify_samba_config.pl
-%%EXAMPLESDIR%%/misc/swat.pl
-%%EXAMPLESDIR%%/misc/wall.perl
-%%EXAMPLESDIR%%/libsmbclient/Makefile
-%%EXAMPLESDIR%%/libsmbclient/README
-%%EXAMPLESDIR%%/libsmbclient/testacl.c
-%%EXAMPLESDIR%%/libsmbclient/testbrowse.c
-%%EXAMPLESDIR%%/libsmbclient/testsmbc.c
-%%EXAMPLESDIR%%/libsmbclient/tree.c
-%%EXAMPLESDIR%%/genlogon/genlogon.pl
-%%EXAMPLESDIR%%/dce-dfs/README
-%%EXAMPLESDIR%%/dce-dfs/smb.conf
-%%EXAMPLESDIR%%/autofs/auto.a
-%%EXAMPLESDIR%%/auth/Makefile
-%%EXAMPLESDIR%%/auth/auth_skel.c
-%%EXAMPLESDIR%%/appliance/Makefile
-%%EXAMPLESDIR%%/appliance/README
-%%EXAMPLESDIR%%/appliance/appliance.spec
-%%EXAMPLESDIR%%/appliance/build.sh
-%%EXAMPLESDIR%%/appliance/smb.conf-appliance
-%%EXAMPLESDIR%%/nss/nss_winbind.c
-%%EXAMPLESDIR%%/nss/nss_winbind.h
-%%EXAMPLESDIR%%/nss/wbtest.c
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/smb.conf.default
-share/swat/help/AccessControls.html
-share/swat/help/AdvancedNetworkManagement.html
-share/swat/help/Appendixes.html
-share/swat/help/Backup.html
-share/swat/help/CUPS-printing.html
-share/swat/help/ClientConfig.html
-share/swat/help/DNSDHCP.html
-share/swat/help/FastStart.html
-share/swat/help/Further-Resources.html
-share/swat/help/InterdomainTrusts.html
-share/swat/help/IntroSMB.html
-share/swat/help/NT4Migration.html
-share/swat/help/NetworkBrowsing.html
-share/swat/help/Other-Clients.html
-share/swat/help/PolicyMgmt.html
-share/swat/help/Portability.html
-share/swat/help/ProfileMgmt.html
-share/swat/help/SWAT.html
-share/swat/help/Samba-Developers-Guide.html
-share/swat/help/Samba-HOWTO-Collection.html
-share/swat/help/SambaHA.html
-share/swat/help/ServerType.html
-share/swat/help/StandAloneServer.html
-share/swat/help/VFS.html
-share/swat/help/bugreport.html
-share/swat/help/compiling.html
-share/swat/help/diagnosis.html
-share/swat/help/domain-member.html
-share/swat/help/editreg.1.html
-share/swat/help/findsmb.1.html
-share/swat/help/groupmapping.html
-share/swat/help/index.html
-share/swat/help/install.html
-share/swat/help/integrate-ms-networks.html
-share/swat/help/introduction.html
-share/swat/help/ix01.html
-share/swat/help/lmhosts.5.html
-share/swat/help/locking.html
-share/swat/help/log2pcap.1.html
-share/swat/help/migration.html
-share/swat/help/mount.cifs.8.html
-share/swat/help/msdfs.html
-share/swat/help/net.8.html
-share/swat/help/nmbd.8.html
-share/swat/help/nmblookup.1.html
-share/swat/help/ntlm_auth.1.html
-share/swat/help/optional.html
-share/swat/help/pam.html
-share/swat/help/passdb.html
-share/swat/help/pdbedit.8.html
-share/swat/help/pr01.html
-share/swat/help/pr02.html
-share/swat/help/printing.html
-share/swat/help/problems.html
-share/swat/help/profiles.1.html
-share/swat/help/rpcclient.1.html
-share/swat/help/samba-bdc.html
-share/swat/help/samba-pdc.html
-share/swat/help/samba.7.html
-share/swat/help/securing-samba.html
-share/swat/help/smb.conf.5.html
-share/swat/help/smbcacls.1.html
-share/swat/help/smbclient.1.html
-share/swat/help/smbcontrol.1.html
-share/swat/help/smbcquotas.1.html
-share/swat/help/smbd.8.html
-share/swat/help/smbget.1.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/smbsh.1.html
-share/swat/help/smbspool.8.html
-share/swat/help/smbstatus.1.html
-share/swat/help/smbtar.1.html
-share/swat/help/smbtree.1.html
-share/swat/help/smbumount.8.html
-share/swat/help/speed.html
-share/swat/help/swat.8.html
-share/swat/help/tdbbackup.8.html
-share/swat/help/tdbdump.8.html
-share/swat/help/testparm.1.html
-share/swat/help/testprns.1.html
-share/swat/help/troubleshooting.html
-share/swat/help/type.html
-share/swat/help/unicode.html
-share/swat/help/upgrading-to-3.0.html
-share/swat/help/vfstest.1.html
-share/swat/help/wbinfo.1.html
-share/swat/help/welcome.html
-share/swat/help/winbind.html
-share/swat/help/winbindd.8.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/images/wizard.gif
-share/swat/help/images/10small.png
-share/swat/help/images/11small.png
-share/swat/help/images/12small.png
-share/swat/help/images/13small.png
-share/swat/help/images/14small.png
-share/swat/help/images/1small.png
-share/swat/help/images/2small.png
-share/swat/help/images/3small.png
-share/swat/help/images/4small.png
-share/swat/help/images/5small.png
-share/swat/help/images/6small.png
-share/swat/help/images/7small.png
-share/swat/help/images/8small.png
-share/swat/help/images/9small.png
-share/swat/help/images/a_small.png
-share/swat/help/images/access1.png
-share/swat/help/images/browsing1.png
-share/swat/help/images/cups1.png
-share/swat/help/images/cups2.png
-share/swat/help/images/domain.png
-share/swat/help/images/ethereal1.png
-share/swat/help/images/ethereal2.png
-share/swat/help/images/idmap-gid2sid.png
-share/swat/help/images/idmap-groups.png
-share/swat/help/images/idmap-sid2gid.png
-share/swat/help/images/idmap-sid2uid.png
-share/swat/help/images/idmap-store-gid2sid.png
-share/swat/help/images/idmap-uid2sid.png
-share/swat/help/images/idmap.png
-share/swat/help/images/idmap_winbind_no_loop.png
-share/swat/help/images/pdftoepsonusb.png
-share/swat/help/images/pdftosocket.png
-share/swat/help/images/trusts1.png
-share/swat/include/footer.html
-share/swat/include/header.html
-share/swat/lang/ja/help/welcome.html
-share/swat/lang/ja/include/footer.html
-share/swat/lang/ja/include/header.html
-share/swat/lang/ja/include/header.nocss.html
-share/swat/lang/ja/include/header_css.html
-share/swat/lang/tr/help/welcome.html
-share/swat/lang/tr/images/globals.gif
-share/swat/lang/tr/images/home.gif
-share/swat/lang/tr/images/passwd.gif
-share/swat/lang/tr/images/printers.gif
-share/swat/lang/tr/images/samba.gif
-share/swat/lang/tr/images/shares.gif
-share/swat/lang/tr/images/status.gif
-share/swat/lang/tr/images/viewconfig.gif
-share/swat/lang/tr/include/header.html
-share/swat/using_samba/figs/sam2_0101.gif
-share/swat/using_samba/figs/sam2_0102.gif
-share/swat/using_samba/figs/sam2_0103.gif
-share/swat/using_samba/figs/sam2_0104.gif
-share/swat/using_samba/figs/sam2_0105.gif
-share/swat/using_samba/figs/sam2_0106.gif
-share/swat/using_samba/figs/sam2_0107.gif
-share/swat/using_samba/figs/sam2_0108.gif
-share/swat/using_samba/figs/sam2_0109.gif
-share/swat/using_samba/figs/sam2_0110.gif
-share/swat/using_samba/figs/sam2_0111.gif
-share/swat/using_samba/figs/sam2_0112.gif
-share/swat/using_samba/figs/sam2_0113.gif
-share/swat/using_samba/figs/sam2_0114.gif
-share/swat/using_samba/figs/sam2_0201.gif
-share/swat/using_samba/figs/sam2_0202.gif
-share/swat/using_samba/figs/sam2_0203.gif
-share/swat/using_samba/figs/sam2_0204.gif
-share/swat/using_samba/figs/sam2_0301.gif
-share/swat/using_samba/figs/sam2_0302.gif
-share/swat/using_samba/figs/sam2_0303.gif
-share/swat/using_samba/figs/sam2_0304.gif
-share/swat/using_samba/figs/sam2_0305.gif
-share/swat/using_samba/figs/sam2_0306.gif
-share/swat/using_samba/figs/sam2_0307.gif
-share/swat/using_samba/figs/sam2_0308.gif
-share/swat/using_samba/figs/sam2_0309.gif
-share/swat/using_samba/figs/sam2_0310.gif
-share/swat/using_samba/figs/sam2_0311.gif
-share/swat/using_samba/figs/sam2_0312.gif
-share/swat/using_samba/figs/sam2_0313.gif
-share/swat/using_samba/figs/sam2_0314.gif
-share/swat/using_samba/figs/sam2_0315.gif
-share/swat/using_samba/figs/sam2_0316.gif
-share/swat/using_samba/figs/sam2_0317.gif
-share/swat/using_samba/figs/sam2_0318.gif
-share/swat/using_samba/figs/sam2_0319.gif
-share/swat/using_samba/figs/sam2_0320.gif
-share/swat/using_samba/figs/sam2_0321.gif
-share/swat/using_samba/figs/sam2_0322.gif
-share/swat/using_samba/figs/sam2_0323.gif
-share/swat/using_samba/figs/sam2_0324.gif
-share/swat/using_samba/figs/sam2_0325.gif
-share/swat/using_samba/figs/sam2_0326.gif
-share/swat/using_samba/figs/sam2_0327.gif
-share/swat/using_samba/figs/sam2_0328.gif
-share/swat/using_samba/figs/sam2_0329.gif
-share/swat/using_samba/figs/sam2_0330.gif
-share/swat/using_samba/figs/sam2_0331.gif
-share/swat/using_samba/figs/sam2_0332.gif
-share/swat/using_samba/figs/sam2_0333.gif
-share/swat/using_samba/figs/sam2_0334.gif
-share/swat/using_samba/figs/sam2_0335.gif
-share/swat/using_samba/figs/sam2_0336.gif
-share/swat/using_samba/figs/sam2_0337.gif
-share/swat/using_samba/figs/sam2_0338.gif
-share/swat/using_samba/figs/sam2_0339.gif
-share/swat/using_samba/figs/sam2_0340.gif
-share/swat/using_samba/figs/sam2_0341.gif
-share/swat/using_samba/figs/sam2_0342.gif
-share/swat/using_samba/figs/sam2_0343.gif
-share/swat/using_samba/figs/sam2_0344.gif
-share/swat/using_samba/figs/sam2_0345.gif
-share/swat/using_samba/figs/sam2_0346.gif
-share/swat/using_samba/figs/sam2_0347.gif
-share/swat/using_samba/figs/sam2_0348.gif
-share/swat/using_samba/figs/sam2_0349.gif
-share/swat/using_samba/figs/sam2_0350.gif
-share/swat/using_samba/figs/sam2_0351.gif
-share/swat/using_samba/figs/sam2_0352.gif
-share/swat/using_samba/figs/sam2_0353.gif
-share/swat/using_samba/figs/sam2_0354.gif
-share/swat/using_samba/figs/sam2_0355.gif
-share/swat/using_samba/figs/sam2_0356.gif
-share/swat/using_samba/figs/sam2_0357.gif
-share/swat/using_samba/figs/sam2_0358.gif
-share/swat/using_samba/figs/sam2_0359.gif
-share/swat/using_samba/figs/sam2_0360.gif
-share/swat/using_samba/figs/sam2_0361.gif
-share/swat/using_samba/figs/sam2_0401.gif
-share/swat/using_samba/figs/sam2_0402.gif
-share/swat/using_samba/figs/sam2_0403.gif
-share/swat/using_samba/figs/sam2_0404.gif
-share/swat/using_samba/figs/sam2_0405.gif
-share/swat/using_samba/figs/sam2_0406.gif
-share/swat/using_samba/figs/sam2_0407.gif
-share/swat/using_samba/figs/sam2_0408.gif
-share/swat/using_samba/figs/sam2_0409.gif
-share/swat/using_samba/figs/sam2_0410.gif
-share/swat/using_samba/figs/sam2_0411.gif
-share/swat/using_samba/figs/sam2_0412.gif
-share/swat/using_samba/figs/sam2_0413.gif
-share/swat/using_samba/figs/sam2_0414.gif
-share/swat/using_samba/figs/sam2_0415.gif
-share/swat/using_samba/figs/sam2_0416.gif
-share/swat/using_samba/figs/sam2_0417.gif
-share/swat/using_samba/figs/sam2_0501.gif
-share/swat/using_samba/figs/sam2_0502.gif
-share/swat/using_samba/figs/sam2_0503.gif
-share/swat/using_samba/figs/sam2_0504.gif
-share/swat/using_samba/figs/sam2_0505.gif
-share/swat/using_samba/figs/sam2_0506.gif
-share/swat/using_samba/figs/sam2_0507.gif
-share/swat/using_samba/figs/sam2_0508.gif
-share/swat/using_samba/figs/sam2_0601.gif
-share/swat/using_samba/figs/sam2_0602.gif
-share/swat/using_samba/figs/sam2_0603.gif
-share/swat/using_samba/figs/sam2_0604.gif
-share/swat/using_samba/figs/sam2_0605.gif
-share/swat/using_samba/figs/sam2_0701.gif
-share/swat/using_samba/figs/sam2_0801.gif
-share/swat/using_samba/figs/sam2_0802.gif
-share/swat/using_samba/figs/sam2_0803.gif
-share/swat/using_samba/figs/sam2_0804.gif
-share/swat/using_samba/figs/sam2_0805.gif
-share/swat/using_samba/figs/sam2_0806.gif
-share/swat/using_samba/figs/sam2_0807.gif
-share/swat/using_samba/figs/sam2_0808.gif
-share/swat/using_samba/figs/sam2_0809.gif
-share/swat/using_samba/figs/sam2_0810.gif
-share/swat/using_samba/figs/sam2_0811.gif
-share/swat/using_samba/figs/sam2_0901.gif
-share/swat/using_samba/figs/sam2_0902.gif
-share/swat/using_samba/figs/sam2_0903.gif
-share/swat/using_samba/figs/sam2_1001.gif
-share/swat/using_samba/figs/sam2_1002.gif
-share/swat/using_samba/figs/sam2_1003.gif
-share/swat/using_samba/figs/sam2_1004.gif
-share/swat/using_samba/figs/sam2_1005.gif
-share/swat/using_samba/figs/sam2_1006.gif
-share/swat/using_samba/figs/sam2_1101.gif
-share/swat/using_samba/figs/sam2_1102.gif
-share/swat/using_samba/figs/sam2_af01.gif
-share/swat/using_samba/figs/sam2_af02.gif
-share/swat/using_samba/figs/sam2_af03.gif
-share/swat/using_samba/figs/sam2_af04.gif
-share/swat/using_samba/figs/sam2_af05.gif
-share/swat/using_samba/figs/sam2_af06.gif
-share/swat/using_samba/figs/sam2_af07.gif
-share/swat/using_samba/appa.html
-share/swat/using_samba/appb.html
-share/swat/using_samba/appc.html
-share/swat/using_samba/appd.html
-share/swat/using_samba/appe.html
-share/swat/using_samba/appf.html
-share/swat/using_samba/appg.html
-share/swat/using_samba/ch00.html
-share/swat/using_samba/ch01.html
-share/swat/using_samba/ch02.html
-share/swat/using_samba/ch03.html
-share/swat/using_samba/ch04.html
-share/swat/using_samba/ch05.html
-share/swat/using_samba/ch06.html
-share/swat/using_samba/ch07.html
-share/swat/using_samba/ch08.html
-share/swat/using_samba/ch09.html
-share/swat/using_samba/ch10.html
-share/swat/using_samba/ch11.html
-share/swat/using_samba/ch12.html
-share/swat/using_samba/inx.html
-share/swat/using_samba/toc.html
-share/swat/using_samba/samba2_s.gif
-share/swat/using_samba/samba2_xs.gif
-@dirrm share/swat/using_samba/figs
-@dirrm share/swat/using_samba
-@dirrm share/swat/lang/tr/include
-@dirrm share/swat/lang/tr/images
-@dirrm share/swat/lang/tr/help
-@dirrm share/swat/lang/tr
-@dirrm share/swat/lang/ja/include
-@dirrm share/swat/lang/ja/images
-@dirrm share/swat/lang/ja/help
-@dirrm share/swat/lang/ja
-@dirrm share/swat/lang
-@dirrm share/swat/include
-@dirrm share/swat/images
-@dirrm share/swat/help/images
-@dirrm share/swat/help
-@dirrm share/swat
-%%SMBPASS%%@dirrm %%EXAMPLESDIR%%/pam_smbpass
-%%PYTHON%%@dirrm %%EXAMPLESDIR%%/python/spoolss
-%%PYTHON%%@dirrm %%EXAMPLESDIR%%/python/tdbpack
-%%PYTHON%%@dirrm %%EXAMPLESDIR%%/python
-@dirrm %%EXAMPLESDIR%%/wins_hook
-@dirrm %%EXAMPLESDIR%%/validchars
-@dirrm %%EXAMPLESDIR%%/tridge
-@dirrm %%EXAMPLESDIR%%/thoralf
-@dirrm %%EXAMPLESDIR%%/svr4-startup
-@dirrm %%EXAMPLESDIR%%/simple
-@dirrm %%EXAMPLESDIR%%/printing
-@dirrm %%EXAMPLESDIR%%/printer-accounting
-@dirrm %%EXAMPLESDIR%%/pdb/mysql
-@dirrm %%EXAMPLESDIR%%/pdb
-@dirrm %%EXAMPLESDIR%%/ntlogon
-@dirrm %%EXAMPLESDIR%%/nss
-@dirrm %%EXAMPLESDIR%%/misc
-@dirrm %%EXAMPLESDIR%%/libsmbclient
-@dirrm %%EXAMPLESDIR%%/genlogon
-@dirrm %%EXAMPLESDIR%%/dce-dfs
-@dirrm %%EXAMPLESDIR%%/autofs
-@dirrm %%EXAMPLESDIR%%/auth
-@dirrm %%EXAMPLESDIR%%/appliance
-@dirrm %%EXAMPLESDIR%%/VFS
-@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd
-@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools/cgi
-@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools
-@dirrm %%EXAMPLESDIR%%/LDAP
-@dirrm %%EXAMPLESDIR%%
-@dirrm lib/samba/vfs
-@dirrm lib/samba/rpc
-@dirrm lib/samba/pdb
-@dirrm lib/samba/idmap
-@dirrm lib/samba/charset
-@dirrm lib/samba/auth
-@dirrm lib/samba
-%%PYTHON%%@unexec rmdir -p %D/lib/%%PYTHON_VERSION%%/site-packages/samba/. 2>/dev/null || true
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Registry
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/htmldocs/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/htmldocs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/sdr/Makefile b/net/sdr/Makefile
deleted file mode 100644
index a4003f4bb28c..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=	3.0
-CATEGORIES=	mbone tk84
-MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/3.0/
-
-MAINTAINER=	fenner@FreeBSD.org
-COMMENT=	Multicast Session Directory
-
-LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
-BUILD_DEPENDS=	${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase
-
-PLIST_FILES=	bin/sdr
-WRKSRC=		${WRKDIR}/sdr/freebsd
-HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-
-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 e4b43bae78a4..000000000000
--- a/net/sdr/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (sdr-3.0.tar.gz) = df7df7911b5c08df968296f970f9e31d
-SIZE (sdr-3.0.tar.gz) = 304691
diff --git a/net/sdr/files/Makefile.freebsd b/net/sdr/files/Makefile.freebsd
deleted file mode 100644
index 303950175fa9..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.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/uclmmbase
-LIBS        = -L${LOCALBASE}/lib -ltk84 -ltcl84 -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 bb154934fbd1..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.4 ../src/plugin2tcl.tcl
- 
- uweb: $(WWWOBJS)
- 	$(CC) -ggdb -o uweb $(WWWOBJS) $(LIBS)
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/spread4/Makefile b/net/spread4/Makefile
deleted file mode 100644
index b3528f4ae269..000000000000
--- a/net/spread4/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-# New ports collection makefile for:	spread
-# Date created:		11 June 2001
-# Whom:			Anders Nordby <anders@fix.no>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	spread
-PORTVERSION=	3.17.1
-CATEGORIES=	net perl5
-MASTER_SITES=	http://www.cnds.jhu.edu/download/noformdown/
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}
-
-MAINTAINER=	joshua@roughtrade.net
-COMMENT=	The Spread Group Communication System, a network toolkit
-
-USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
-
-MAN1=	spflooder.1 spmonitor.1 spread.1 sptuser.1 spuser.1
-MAN3=	libsp.3 SP_connect.3 SP_disconnect.3 SP_equal_group_ids.3 SP_error.3 \
-	SP_join.3 SP_leave.3 SP_multicast.3 SP_multigroup_multicast.3 \
-	SP_multigroup_scat_multicast.3 SP_poll.3 SP_receive.3 \
-	SP_scat_multicast.3 SP_scat_receive.3
-
-USE_PERL5=	yes
-USE_RC_SUBR=	yes
-INSTALLS_SHLIB=	yes
-PKGMESSAGE=	${WRKSRC}/license.txt
-
-MAKE_ARGS+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
-
-.if !defined(NOPORTDOCS)
-PORTDOCS+=	Readme.txt LICENSE
-.endif
-
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
-
-.include <bsd.port.pre.mk>
-
-# bsd.port.mk doesn't allow us to use GNU_CONFIGURE and PERL_CONFIGURE together.
-
-PERL_CONFIGURE_ARGS=	CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
-		INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"
-
-_MANPAGES+=	${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3
-
-post-configure:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/docs/spread.1 ${WRKSRC}/docs/spmonitor.1
-
-post-build:
-	@cd ${WRKSRC}/perl/Spread && \
-		${SETENV} ${CONFIGURE_ENV} ${PERL5} ./Makefile.PL ${PERL_CONFIGURE_ARGS}
-	@cd ${WRKSRC}/perl/Spread && \
-		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
-	@cd ${WRKSRC}/perl/Spread && ${MAKE}
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/spread.sh > ${WRKDIR}/spread.sh
-
-pre-install:
-	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/spread.sh ${PREFIX}/etc/rc.d/spread.sh
-	${INSTALL_DATA} ${WRKSRC}/sp.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/sp_func.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/sp_events.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/sample.spread.conf ${PREFIX}/etc/spread.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/sample.spread.access_ip ${PREFIX}/etc/spread.access_ip.sample
-	(cd ${WRKSRC}/perl/Spread && ${MAKE} install)
-.if !defined(NOPORTDOCS)
-	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
-	${INSTALL} -d -o root -g wheel -m 0755 ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR}/LICENSE
-	${INSTALL_SCRIPT} ${WRKSRC}/perl/Spread/test.pl ${EXAMPLESDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
-	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.post.mk>
diff --git a/net/spread4/distinfo b/net/spread4/distinfo
deleted file mode 100644
index 5c0534733595..000000000000
--- a/net/spread4/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (spread-src-3.17.1.tar.gz) = b423da7012f0237a877b604ebd80cfc4
-SIZE (spread-src-3.17.1.tar.gz) = 290861
diff --git a/net/spread4/files/patch-Makefile.in b/net/spread4/files/patch-Makefile.in
deleted file mode 100644
index 32dd8494442e..000000000000
--- a/net/spread4/files/patch-Makefile.in
+++ /dev/null
@@ -1,105 +0,0 @@
---- Makefile.in	Wed Jun 18 05:00:10 2003
-+++ Makefile.in	Tue Aug  5 21:26:23 2003
-@@ -26,7 +26,7 @@
- #Rules: major  -- inc for incompatible change
- #     : minor  -- inc for bugfix or forward compatible change
- 
--LIBVERSION=1.0
-+LIBVERSION=1
- 
- PATHS= 
- 
-@@ -35,7 +35,7 @@
- CFLAGS=@CFLAGS@
- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
- LDFLAGS=@LDFLAGS@
--LIBS=@LIBS@
-+LIBS=-L. @LIBS@
- THLDFLAGS=@THLDFLAGS@
- THLIBS=@THLIBS@
- AR=@AR@
-@@ -52,8 +52,10 @@
- PERL=@PERL@
- ENT=@ENT@
- EXEEXT=@EXEEXT@
-+SHLDSONAME=-Wl,-soname,libspread.so.$(LIBVERSION)
-+TSHLDSONAME=-Wl,-soname,libtspread.so.$(LIBVERSION)
- 
--TARGETS=spread$(EXEEXT) spuser$(EXEEXT) spflooder$(EXEEXT) spmonitor$(EXEEXT) sptuser${EXEEXT} @LIBSPSO@ @LIBTSPSO@
-+TARGETS=spread$(EXEEXT) spuser$(EXEEXT) spflooder$(EXEEXT) spmonitor$(EXEEXT) sptuser${EXEEXT} @LIBSPSO@ @LIBTSPSO@ libspread.a libtspread.a
- 
- LIBSP_OBJS= alarm.o events.o memory.o sp.o
- 
-@@ -124,8 +126,11 @@
- 	$(INSTALL) -m 0755 libspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libspread.$(LIBVERSION).dylib
- 	(cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libspread.$(LIBVERSION).dylib libspread.dylib)
- 
--libspread.so:	$(LIBSP_SHOBJS)
--	$(SHLD) -o $@ $(LIBSP_SHOBJS) $(SHLDFLAGS) $(SHLIBS)
-+libspread.so:	$@.$(LIBVERSION)
-+	$(SOFTLINK) $@.$(LIBVERSION) $@
-+
-+libspread.so.$(LIBVERSION):	$(LIBSP_SHOBJS)
-+	$(SHLD) -o $@ $(LIBSP_SHOBJS) $(SHLDSONAME) $(SHLDFLAGS) $(SHLIBS)
- 
- install-libspread.so:	libspread.so
- 	$(INSTALL) -m 0755 libspread.so $(DESTDIR)$(libdir)/libspread.so.$(LIBVERSION)
-@@ -143,8 +148,11 @@
- 	$(INSTALL) -m 0755 libtspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libtspread.$(LIBVERSION).dylib
- 	(cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libtspread.$(LIBVERSION).dylib libtspread.dylib)
- 
--libtspread.so:	$(LIBTSP_SHOBJS)
--	$(SHLD) -o $@ $(LIBTSP_SHOBJS) $(SHLDFLAGS) $(SHLIBS) $(THLIBS)
-+libtspread.so:	$@.$(LIBVERSION)
-+	$(SOFTLINK) $@.$(LIBVERSION) $@
-+
-+libtspread.so.$(LIBVERSION):	$(LIBTSP_SHOBJS)
-+	$(SHLD) -o $@ $(LIBTSP_SHOBJS) $(TSHLDSONAME) $(SHLDFLAGS) $(SHLIBS) $(THLIBS)
- 
- install-libtspread.so:	libtspread.so
- 	$(INSTALL) -m 0755 libtspread.so $(DESTDIR)$(libdir)/libtspread.so.$(LIBVERSION)
-@@ -153,17 +161,17 @@
- spread$(EXEEXT): $(SPREADOBJS)
- 	$(LD) -o $@ $(SPREADOBJS) $(LDFLAGS) $(LIBS)
- 
--spuser$(EXEEXT): libspread.a	user.o
--	$(LD) -o $@ user.o $(LDFLAGS) libspread.a $(LIBS)
-+spuser$(EXEEXT): libspread.so	user.o
-+	$(LD) -o $@ user.o $(LDFLAGS) -lspread $(LIBS)
- 
--spflooder$(EXEEXT): libspread.a flooder.o
--	$(LD) -o $@ flooder.o $(LDFLAGS) libspread.a $(LIBS)
-+spflooder$(EXEEXT): libspread.so flooder.o
-+	$(LD) -o $@ flooder.o $(LDFLAGS) -lspread $(LIBS)
- 
- spmonitor$(EXEEXT): $(MONITOROBJS)
- 	$(LD) -o $@ $(MONITOROBJS) $(LDFLAGS) $(LIBS) 
- 
--sptuser$(EXEEXT): user.to libtspread.a
--	$(LD) $(THLDFLAGS) -o $@ user.to libtspread.a $(LDFLAGS) $(LIBS) $(THLIBS)
-+sptuser$(EXEEXT): user.to libtspread.so
-+	$(LD) $(THLDFLAGS) -o $@ user.to -ltspread $(LDFLAGS) $(LIBS) $(THLIBS)
- 
- spsimple_user$(EXEEXT): simple_user.o libspread.a
- 	$(LD) -o $@ simple_user.o $(LDFLAGS) libspread.a $(LIBS) 
-@@ -192,7 +200,7 @@
- 	fi
- 
- clean:
--	rm -f *.lo *.tlo *.to *.o *.a *.dylib $(TARGETS) spsimple_user
-+	rm -f *.lo *.tlo *.to *.o *.a *.dylib $(TARGETS) spsimple_user *.so.$(LIBVERSION)
- 	rm -f config.cache config.log docs/*.out core
- 	rm -rf autom4te.cache
- 
-@@ -247,11 +255,6 @@
- 	done
- 	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
- 		$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
--	fi
--	if [ ! -f $(DESTDIR)$(sysconfdir)/spread.conf ]; then \
--		$(INSTALL) -m 644 $(srcdir)/sample.spread.conf $(DESTDIR)$(sysconfdir)/spread.conf; \
--	else \
--		echo "$(DESTDIR)$(sysconfdir)/spread.conf already exists, install will not overwrite"; \
- 	fi
- 
- uninstallall:	uninstall
diff --git a/net/spread4/files/patch-auth-ip.c b/net/spread4/files/patch-auth-ip.c
deleted file mode 100644
index 278edc27a50c..000000000000
--- a/net/spread4/files/patch-auth-ip.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- auth-ip.c	Sun Sep 22 12:56:52 2002
-+++ auth-ip.c	Tue Aug  5 21:27:40 2003
-@@ -90,12 +90,9 @@
-     /* load spread.access_ip file */
-     if (NULL != (fp = fopen(file_name,"r")) )
-         Alarm( PRINT, "ip_init: using file: %s\n", file_name);
--    if (fp == NULL) 
--        if (NULL != (fp = fopen("./spread.access_ip", "r")) )
--            Alarm( PRINT, "ip_init: using file: ./spread.access_ip\n");
-     if (fp == NULL)
--        if (NULL != (fp = fopen("/etc/spread.access_ip", "r")) )
--            Alarm( PRINT, "ip_init: using file: /etc/spread.access_ip\n");
-+        if (NULL != (fp = fopen(SPREAD_ETCDIR "/spread.access_ip", "r")) )
-+            Alarm( PRINT, "ip_init: using file: " SPREAD_ETCDIR "/spread.access_ip\n");
-     if (fp == NULL)
-     {
-         Alarm( PRINT, "ip_init: IP access control file not found.\nIf you are using IP based access controls, please make sure the file exists.\n");
diff --git a/net/spread4/files/patch-auth-pword.c b/net/spread4/files/patch-auth-pword.c
deleted file mode 100644
index c0bae4a7b0cf..000000000000
--- a/net/spread4/files/patch-auth-pword.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- auth-pword.c	Sun Sep 22 12:56:52 2002
-+++ auth-pword.c	Tue Aug  5 21:28:50 2003
-@@ -118,12 +118,9 @@
-     /* load spread.access_ip file */
-     if (NULL != (fp = fopen(file_name,"r")) )
-         Alarm( PRINT, "pword_init: using file: %s\n", file_name);
--    if (fp == NULL) 
--        if (NULL != (fp = fopen("./spread.access_pword", "r")) )
--            Alarm( PRINT, "pword_init: using file: ./spread.access_pword\n");
-     if (fp == NULL)
--        if (NULL != (fp = fopen("/etc/spread.access_pword", "r")) )
--            Alarm( PRINT, "pword_init: using file: /etc/spread.access_pword\n");
-+        if (NULL != (fp = fopen(SPREAD_ETCDIR "/spread.access_pword", "r")) )
-+            Alarm( PRINT, "pword_init: using file: " SPREAD_ETCDIR "/spread.access_pword\n");
-     if (fp == NULL)
-         Alarm( EXIT, "pword_init: error opening config file %s in any of the standard locations. Please make sure the file exists\n", file_name);
- 
diff --git a/net/spread4/files/patch-configuration.c b/net/spread4/files/patch-configuration.c
deleted file mode 100644
index b571a339aba8..000000000000
--- a/net/spread4/files/patch-configuration.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- configuration.c	Sun Sep 22 12:56:52 2002
-+++ configuration.c	Tue Aug  5 21:24:19 2003
-@@ -128,9 +128,6 @@
- 
- 	if (NULL != (yyin = fopen(file_name,"r")) )
-                 Alarm( PRINT, "Conf_init: using file: %s\n", file_name);
--	if (yyin == NULL) 
--		if (NULL != (yyin = fopen("./spread.conf", "r")) )
--                        Alarm( PRINT, "Conf_init: using file: ./spread.conf\n");
- 	if (yyin == NULL)
- 		if (NULL != (yyin = fopen(configfile_location, "r")) )
-                         Alarm( PRINT, "Conf_init: using file: %s\n", configfile_location);
diff --git a/net/spread4/files/patch-docs::spmonitor.1 b/net/spread4/files/patch-docs::spmonitor.1
deleted file mode 100644
index 982d5bb32913..000000000000
--- a/net/spread4/files/patch-docs::spmonitor.1
+++ /dev/null
@@ -1,18 +0,0 @@
---- docs/spmonitor.1	Thu Dec 13 02:01:49 2001
-+++ docs/spmonitor.1	Mon Dec  8 00:00:34 2003
-@@ -27,13 +27,11 @@
- Use an alternate configuration file
- .I config-file
- instead of
--.IR ./spread.conf .
-+.IR /etc/spread.conf .
- .SH FILES
--.I ./spread.conf
-+.I /etc/spread.conf
- .RS
- The default config file location. 
--.I /etc/spread.conf 
--is also searched if a local file is not found.
- .SH BUGS
- The spmonitor works by sending UDP packets to the Spread daemon, so if network 
- losses occur, commands or status reports can be lost. It can also lose reports
diff --git a/net/spread4/files/patch-docs::spread.1 b/net/spread4/files/patch-docs::spread.1
deleted file mode 100644
index 6dca20e2b73d..000000000000
--- a/net/spread4/files/patch-docs::spread.1
+++ /dev/null
@@ -1,18 +0,0 @@
---- docs/spread.1	Thu Dec 13 02:03:19 2001
-+++ docs/spread.1	Mon Dec  8 00:00:20 2003
-@@ -20,13 +20,11 @@
- Use an alternate configuration file
- .I config-file
- instead of
--.IR ./spread.conf .
-+.IR /etc/spread.conf .
- .SH FILES
--.I ./spread.conf
-+.I /etc/spread.conf
- .RS
- The default config file location. 
--.I /etc/spread.conf 
--is also searched if a local file is not found.
- .SH DIAGNOSTICS
- The daemon will output some startup information to stdout
- and any severe errors will also be output to stdout. Redirecting
diff --git a/net/spread4/files/patch-perl::Spread::Spread.pm b/net/spread4/files/patch-perl::Spread::Spread.pm
deleted file mode 100644
index a753b18f6b45..000000000000
--- a/net/spread4/files/patch-perl::Spread::Spread.pm
+++ /dev/null
@@ -1,13 +0,0 @@
---- perl/Spread/Spread.pm	Mon Dec  8 21:12:18 2003
-+++ perl/Spread/Spread.pm	Mon Dec  8 21:15:44 2003
-@@ -177,8 +177,8 @@
- 
-   # Connect
-   my($mailbox, $private_group) = Spread::connect(
--	spread_name => '4444@host.domain.com',
--	private_name => 'mrcool',
-+	{ spread_name => '4803@host.domain.com',
-+	private_name => 'mrcool', }
- 	);
- 
-   # Join and leave groups
diff --git a/net/spread4/files/patch-sample.spread.conf b/net/spread4/files/patch-sample.spread.conf
deleted file mode 100644
index 1926dea8116c..000000000000
--- a/net/spread4/files/patch-sample.spread.conf
+++ /dev/null
@@ -1,20 +0,0 @@
---- sample.spread.conf	Mon Dec  8 01:26:39 2003
-+++ sample.spread.conf	Mon Dec  8 01:26:53 2003
-@@ -50,7 +50,7 @@
- # cause the daemons to log to "spreadlog_machine1.mydomain.com.log" and
- # "spreadlog_machine2.mydomain.com.log" respectively.
- 
--#EventLogFile = testlog.out
-+EventLogFile = /var/log/spread.log
- 
- #Set whether to add a timestamp in front of all logged events or not.
- # Default is no timestamps. Default format is "[%a %d %b %Y %H:%M:%S]".
-@@ -62,7 +62,7 @@
- 
- #EventTimeStamp
- # or
--#EventTimeStamp = "[%a %d %b %Y %H:%M:%S]"
-+EventTimeStamp = "[%a %d %b %Y %H:%M:%S]"
- 
- #Set whether to allow dangerous monitor commands 
- # like "partition, flow_control, or kill"
diff --git a/net/spread4/files/patch-session.c b/net/spread4/files/patch-session.c
deleted file mode 100644
index c33d5523da84..000000000000
--- a/net/spread4/files/patch-session.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- session.c	Tue Aug  5 21:35:52 2003
-+++ session.c	Tue Aug  5 21:31:30 2003
-@@ -406,7 +406,7 @@
- 	    Alarm( EXIT, "Sess_init: UNIX sock error\n" );
- 
- 	unix_addr.sun_family	= AF_UNIX;
--	sprintf( name, "/tmp/%d",My.port );
-+	sprintf( name, "%s/spread.sock", _PATH_SPREAD_PIDDIR );
- 	strcpy( unix_addr.sun_path, name ); 
- 	unlink( name );
- 
diff --git a/net/spread4/files/patch-sp.c b/net/spread4/files/patch-sp.c
deleted file mode 100644
index bf1b2a7b8851..000000000000
--- a/net/spread4/files/patch-sp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- sp.c	Tue Aug  5 21:35:28 2003
-+++ sp.c	Tue Aug  5 21:24:19 2003
-@@ -551,7 +551,7 @@
- 		Alarm( SESSION, "SP_connect: set sndbuf/rcvbuf to %d\n", 1024*(i-5) );
- 
- 		unix_addr.sun_family = AF_UNIX;
--		sprintf( unix_addr.sun_path, "/tmp/%d", port );
-+		sprintf( unix_addr.sun_path, "%s/spread.sock", _PATH_SPREAD_PIDDIR );
- 		while( ((ret = connect( s, (struct sockaddr *)&unix_addr, sizeof(unix_addr) )) == -1)
-                        && ((sock_errno == EINTR) || (sock_errno == EAGAIN) || (sock_errno == EWOULDBLOCK)) )
-                 {
diff --git a/net/spread4/files/patch-spread.c b/net/spread4/files/patch-spread.c
deleted file mode 100644
index 0de2385206a1..000000000000
--- a/net/spread4/files/patch-spread.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- spread.c	Thu Jun 19 00:31:23 2003
-+++ spread.c	Mon Dec  8 20:55:41 2003
-@@ -48,6 +48,8 @@
- #include <pwd.h>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <errno.h>
-+#include <stdlib.h>
- #endif
- 
- #ifdef	ARCH_PC_WIN95
-@@ -65,6 +67,7 @@
- 
- static	void	Invalid_privilege_decrease(char *user, char *group);
- static	void	Usage(int argc, char *argv[]);
-+static	void	writepidfile();
- 
- /* auth-null.c: */
- void null_init(void);
-@@ -144,6 +147,11 @@
- 
- #endif	/* ARCH_PC_WIN95 */
- 
-+	if (daemon(0,0) == -1)
-+		Alarm( EXIT, "Spread: couldn't daemonise: %d", strerror(errno) );
-+
-+	writepidfile();
-+
-         /* initialize each valid authentication protocol */
-         null_init();
-         ip_init();
-@@ -193,6 +201,20 @@
- 	E_handle_events();
- 
- 	return 0;
-+}
-+
-+static void
-+writepidfile()
-+{
-+	char pidbuf[11];
-+	int pidfd;
-+
-+	if ((pidfd = open(_PATH_SPREAD_PIDDIR "/spread.pid", O_RDWR | O_CREAT, 0644)) == -1)
-+		Alarm( EXIT, "Spread: couldn't open pidfile for writing" );
-+
-+	snprintf(pidbuf, sizeof(pidbuf), "%ld\n", (long)getpid());
-+	write(pidfd, pidbuf, strlen(pidbuf));
-+	close(pidfd);
- }
- 
- static  void    Print_help(void)
diff --git a/net/spread4/files/spread.sh b/net/spread4/files/spread.sh
deleted file mode 100644
index adc11250484f..000000000000
--- a/net/spread4/files/spread.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: spread
-# REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable spread:
-#
-#spread_enable="YES"
-#
-# See spread(1) for flags
-#
-
-. %%RC_SUBR%%
-
-name=spread
-rcvar=`set_rcvar`
-
-command="%%PREFIX%%/sbin/spread"
-command_args=""
-pidfile=/var/run/${name}.pid
-required_files=%%PREFIX%%/etc/${name}.conf
-
-# set defaults
-
-spread_enable=${spread_enable:-"NO"}
-spread_flags=${spread_flags:-""}
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/net/spread4/pkg-descr b/net/spread4/pkg-descr
deleted file mode 100644
index 43fac02d21a6..000000000000
--- a/net/spread4/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright (c) 1993-2002 Spread Concepts LLC. All rights reserved.
-This product uses software developed by Spread Concepts LLC for use in the
-Spread toolkit. For more information about Spread see http://www.spread.org/
-
-Spread is a toolkit and daemon that provide multicast and group communications
-support to applications across local and wide area networks. Spread is designed
-to make it easy to write groupware, networked multimedia, reliable server, and
-collaborative work applications.
-
-Spread consists of a library that user applications are linked with, a binary
-daemon which runs on each computer that is part of the processor group, and
-various utility and demonstration programs.
-
-WWW: http://www.spread.org/
-
-- Joshua
-joshua@roughtrade.net
diff --git a/net/spread4/pkg-install b/net/spread4/pkg-install
deleted file mode 100644
index fbbf68fd7932..000000000000
--- a/net/spread4/pkg-install
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-USER=spread
-USER_HOMEDIR=/nonexistent
-GROUP=spread
-RUNDIR=/var/run/spread
-NOLOGIN=/sbin/nologin
-
-case $2 in
-PRE-INSTALL)
-    if pw group show "${GROUP}" 2>/dev/null; then
-	echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-	if pw groupadd ${GROUP}; then
-	    echo "Added group \"${GROUP}\"."
-	else
-	    echo "Adding group \"${GROUP}\" failed..."
-	    exit 1
-	fi
-    fi
-
-    if pw user show "${USER}" 2>/dev/null; then
-	echo "You already have a user \"${USER}\", so I will use it."
-	if pw usermod ${USER} -d ${USER_HOMEDIR}
-	then
-	    echo "Changed home directory of \"${USER}\" to \"${USER_HOMEDIR}\"."
-	else
-	    echo "Changing home directory of \"${USER}\" to \"${USER_HOMEDIR}\" failed."
-	    exit 1
-	fi
-    else
-	if pw useradd ${USER} -g ${GROUP} -h - \
-	    -d ${USER_HOMEDIR} -s ${NOLOGIN} -c "Spread User"
-	then
-	    echo "Added user \"${USER}\"."
-	else
-	    echo "Adding user \"${USER}\" failed..."
-	    exit 1
-	fi
-    fi
-    ;;
-POST-INSTALL)
-    if [ ! -d ${RUNDIR} ]; then
-	install -d -o ${USER} -g ${GROUP} -m 0750 ${RUNDIR}
-    fi
-    ;;
-*)
-    echo 'unexpect argument to pkg-install'
-    ;;
-esac
diff --git a/net/spread4/pkg-plist b/net/spread4/pkg-plist
deleted file mode 100644
index ace659ce5f7d..000000000000
--- a/net/spread4/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-bin/spflooder
-bin/spmonitor
-bin/sptuser
-bin/spuser
-etc/rc.d/spread.sh
-etc/spread.access_ip.sample
-etc/spread.conf.sample
-include/sp.h
-include/sp_events.h
-include/sp_func.h
-lib/libspread.a
-lib/libspread.so
-lib/libspread.so.1
-lib/libtspread.a
-lib/libtspread.so
-lib/libtspread.so.1
-%%SITE_PERL%%/%%PERL_ARCH%%/Spread.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix
-sbin/spread
-%%PORTDOCS%%%%EXAMPLESDIR%%/test.pl
-@unexec rmdir /var/run/spread 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/net/tcptraceroute-devel/Makefile b/net/tcptraceroute-devel/Makefile
deleted file mode 100644
index ae2cdcd0fb1e..000000000000
--- a/net/tcptraceroute-devel/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# New ports collection makefile for:   tcptraceroute
-# Date created:        21 March 2002
-# Whom:                jeff@cetlink.net
-#
-# $FreeBSD$
-#
-
-PORTNAME=	tcptraceroute
-PORTVERSION=	1.4
-CATEGORIES=	net
-MASTER_SITES=	http://michael.toren.net/code/tcptraceroute/
-
-MAINTAINER=	corecode@corecode.ath.cx
-COMMENT=	A traceroute implementation using TCP packets
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
-
-MAN8=	tcptraceroute.8
-
-post-install:
-	@${CHMOD} u+s ${PREFIX}/sbin/tcptraceroute
-
-.include <bsd.port.mk>
diff --git a/net/tcptraceroute-devel/distinfo b/net/tcptraceroute-devel/distinfo
deleted file mode 100644
index 19fd48412cc8..000000000000
--- a/net/tcptraceroute-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (tcptraceroute-1.4.tar.gz) = 35c5e7d960f2b073db0109e0004e134e
-SIZE (tcptraceroute-1.4.tar.gz) = 31918
diff --git a/net/tcptraceroute-devel/files/patch-Makefile b/net/tcptraceroute-devel/files/patch-Makefile
deleted file mode 100644
index 6564b05352a2..000000000000
--- a/net/tcptraceroute-devel/files/patch-Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.orig	Mon May 20 03:11:38 2002
-+++ Makefile	Tue Aug 20 01:49:27 2002
-@@ -3,20 +3,27 @@
- # tcptraceroute -- A traceroute implementation using TCP packets
- # Copyright (c) 2001, 2002 Michael C. Toren <mct@toren.net>
- 
--CC = gcc
--CFLAGS = -O2 -Wall
--DESTDIR=/usr/local/bin
-+CC?= cc
-+CFLAGS?= -O -pipe -Wall
-+LNETINC= -I${LOCALBASE}/include
-+LNETLIB= -L${LOCALBASE}/lib
-+
-+BINDIR= ${PREFIX}/sbin
-+MANDIR= ${PREFIX}/man
-+
-+all: tcptraceroute
- 
- tcptraceroute: tcptraceroute.c
--	$(CC) $(CFLAGS) `libnet-config --defines` \
-+	$(CC) $(CFLAGS) `libnet-config --defines` $(LNETINC) \
- 		-o tcptraceroute tcptraceroute.c \
--		`libnet-config --libs` -lpcap
-+		$(LNETLIB) `libnet-config --libs` -lpcap
- 
- static:
- 	$(MAKE) tcptraceroute CFLAGS="$(CFLAGS) -static"
- 
- install: tcptraceroute
--	install -D tcptraceroute $(DESTDIR)/tcptraceroute
-+	install -c -s tcptraceroute $(BINDIR)/tcptraceroute
-+	install -c -m 444 tcptraceroute.8 $(MANDIR)/man8/tcptraceroute.8
- 
- distrib: clean changelog man
- 
diff --git a/net/tcptraceroute-devel/files/patch-tcptraceroute.c b/net/tcptraceroute-devel/files/patch-tcptraceroute.c
deleted file mode 100644
index 28f15e1b7051..000000000000
--- a/net/tcptraceroute-devel/files/patch-tcptraceroute.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- tcptraceroute.c.orig	Tue Oct  7 16:04:50 2003
-+++ tcptraceroute.c	Tue Oct  7 16:05:22 2003
-@@ -391,9 +391,9 @@
- void usage(void)
- {
- 	printf("\n%s\n%s\n", VERSION, BANNER);
--    fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>]
--       [-l <packet length>] [-q <number of queries>] [-t <tos>]
--       [-m <max ttl>] [-pP] <source port>] [-s <source address>]
-+    fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>] \
-+       [-l <packet length>] [-q <number of queries>] [-t <tos>] \
-+       [-m <max ttl>] [-pP] <source port>] [-s <source address>] \
-        [-w <wait time>] <host> [destination port] [packet length]\n\n", name);
- }
- 
-@@ -1182,8 +1182,8 @@
- 	if (! (pcap = pcap_open_live(device, offset + SNAPLEN, 0, 10, errbuf)))
- 		fatal("pcap_open_live failed: %s", errbuf);
- 
--	safe_snprintf(filter, TEXTSIZE, "
--		(tcp and src host %s and src port %d and dst host %s)
-+	safe_snprintf(filter, TEXTSIZE, " \
-+		(tcp and src host %s and src port %d and dst host %s) \
- 		or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)",
- 			iptos(dst_ip), dst_prt, iptos(src_ip), iptos(src_ip));
- 
diff --git a/net/tcptraceroute-devel/pkg-descr b/net/tcptraceroute-devel/pkg-descr
deleted file mode 100644
index b64b1179851b..000000000000
--- a/net/tcptraceroute-devel/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-tcptraceroute is a traceroute implementation using TCP packets.
-
-The more  traditional traceroute(8)  sends out either  UDP or  ICMP ECHO
-packets with a TTL of one,  and increments the TTL until the destination
-has  been reached.  By printing  the  gateways that  generate ICMP  time
-exceeded  messages along  the  way, it  is able  to  determine the  path
-packets are taking to reach the destination.
-
-The problem is  that with the widespread use of  firewalls on the modern
-Internet, many of the packets that  traceroute(8) sends out end up being
-filtered,  making it  impossible to  completely  trace the  path to  the
-destination. However, in many cases, these firewalls will permit inbound
-TCP packets to specific ports that hosts sitting behind the firewall are
-listening for connections on. By sending  out TCP SYN packets instead of
-UDP  or ICMP  ECHO packets,  tcptraceroute is  able to  bypass the  most
-common firewall filters.
-
-WWW: http://michael.toren.net/code/tcptraceroute/
-
-- Simon 'corecode' Schubert
diff --git a/net/tcptraceroute-devel/pkg-plist b/net/tcptraceroute-devel/pkg-plist
deleted file mode 100644
index cbdc4f42fa33..000000000000
--- a/net/tcptraceroute-devel/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $FreeBSD$
-sbin/tcptraceroute
diff --git a/net/tkabber-devel/Makefile b/net/tkabber-devel/Makefile
deleted file mode 100644
index 294cd794bba8..000000000000
--- a/net/tkabber-devel/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# New ports collection makefile for:	tkabber
-# Date created:				22 October 2003
-# Whom:					Alexander Timoshenko <gonzo@univ.kiev.ua>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	tkabber
-PORTVERSION=	0.9.6b
-CATEGORIES=	net
-MASTER_SITES=	http://www.jabberstudio.org/files/tkabber/
-DISTNAME=	tkabber-0.9.6beta
-
-MAINTAINER=	gonzo@univ.kiev.ua
-COMMENT=	Tcl/Tk based jabber client
-
-TCLLIBVER!=	${MAKE} -C ${.CURDIR}/../../devel/tcllib -V PORTVERSION
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
-		${LOCALBASE}/lib/tcllib${TCLLIBVER}/pkgIndex.tcl:${PORTSDIR}/devel/tcllib \
-		${LOCALBASE}/lib/tls/pkgIndex.tcl:${PORTSDIR}/devel/tcltls \
-		${LOCALBASE}/lib/bwidget/pkgIndex.tcl:${PORTSDIR}/x11-toolkits/bwidget
-
-WRKSRC=		${WRKDIR}/${DISTNAME}
-NO_BUILD=	yes
-
-SUBDIRS = emoticons-tkabber plugins jabberlib-tclxml pixmaps \
-		sounds textundo aniemoteicons msgs mclistbox-1.02
-
-do-install:
-	${ECHO} -e "#!/bin/sh\nexec wish8.4 ${DATADIR}/tkabber.tcl \
-		-name tkabber \"\$$@\"\n" > ${PREFIX}/bin/tkabber
-	${CHMOD} +x ${PREFIX}/bin/tkabber
-	${MKDIR} ${DATADIR}
-	${CP} ${WRKSRC}/*.tcl ${WRKSRC}/*.xrdb ${DATADIR}
-.for i in ${SUBDIRS}
-	${CP} -R ${WRKSRC}/${i} ${DATADIR}
-.endfor
-	${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in tkabber.html tkabber.xml
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/tkabber-devel/distinfo b/net/tkabber-devel/distinfo
deleted file mode 100644
index 7d7539b277c3..000000000000
--- a/net/tkabber-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (tkabber-0.9.6beta.tar.gz) = 65e44ae167339dc616c51ab30af030da
-SIZE (tkabber-0.9.6beta.tar.gz) = 611677
diff --git a/net/tkabber-devel/files/patch-default.tcl b/net/tkabber-devel/files/patch-default.tcl
deleted file mode 100644
index 68c15319ea61..000000000000
--- a/net/tkabber-devel/files/patch-default.tcl
+++ /dev/null
@@ -1,13 +0,0 @@
---- default.tcl.orig	Sun Jan 25 21:49:09 2004
-+++ default.tcl	Sun Jan 25 21:49:30 2004
-@@ -23,8 +23,8 @@
- 
- set loginconf(user) ""
- set loginconf(password) ""
--set loginconf(resource) tkabber
--set loginconf(server) localhost
-+set loginconf(resource) TKabber
-+set loginconf(server) jabber.ru
- set loginconf(usealtserver) 0
- set loginconf(altserver) ""
- set loginconf(port) 5222
diff --git a/net/tkabber-devel/files/patch-tkabber.tcl b/net/tkabber-devel/files/patch-tkabber.tcl
deleted file mode 100644
index b09a24981c17..000000000000
--- a/net/tkabber-devel/files/patch-tkabber.tcl
+++ /dev/null
@@ -1,10 +0,0 @@
---- tkabber.tcl.orig	Mon Jun  9 13:00:36 2003
-+++ tkabber.tcl	Fri Oct 17 15:45:06 2003
-@@ -1,6 +1,6 @@
- #!/bin/sh
- # the next line restarts using the correct interpreter \
--exec wish "$0" -name tkabber "$@"
-+exec wish8.4 "$0" -name tkabber "$@"
- 
- # $Id: tkabber.tcl,v 1.159 2003/05/30 18:05:27 aleksey Exp $
- 
diff --git a/net/tkabber-devel/pkg-descr b/net/tkabber-devel/pkg-descr
deleted file mode 100644
index a6b84e265228..000000000000
--- a/net/tkabber-devel/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Tkabber is a free client for an instant messaging system called
-Jabber. It is written in Tcl/Tk and supports many features like
-support of unicode, ssl support, http proxy, file transfers and
-support of multi-user conference protocol.
-
-WWW: http://tkabber.jabber.ru/
diff --git a/net/tkabber-devel/pkg-plist b/net/tkabber-devel/pkg-plist
deleted file mode 100644
index 2b4a6b6498ee..000000000000
--- a/net/tkabber-devel/pkg-plist
+++ /dev/null
@@ -1,472 +0,0 @@
-bin/tkabber
-%%DATADIR%%/Tclx.tcl
-%%DATADIR%%/aniemoteicons/aniemoteicons.tcl
-%%DATADIR%%/aniemoteicons/anigif.tcl
-%%DATADIR%%/avatars.tcl
-%%DATADIR%%/balloon.tcl
-%%DATADIR%%/browser.tcl
-%%DATADIR%%/bwidget_workarounds.tcl
-%%DATADIR%%/chats.tcl
-%%DATADIR%%/custom.tcl
-%%DATADIR%%/datagathering.tcl
-%%DATADIR%%/default.tcl
-%%DATADIR%%/default.xrdb
-%%DATADIR%%/disco.tcl
-%%DATADIR%%/emoticons-tkabber/FaceIronic.gif
-%%DATADIR%%/emoticons-tkabber/FaceStartled.gif
-%%DATADIR%%/emoticons-tkabber/FaceStraight.gif
-%%DATADIR%%/emoticons-tkabber/beer.gif
-%%DATADIR%%/emoticons-tkabber/facegrinning.gif
-%%DATADIR%%/emoticons-tkabber/facehappy.gif
-%%DATADIR%%/emoticons-tkabber/facesad.gif
-%%DATADIR%%/emoticons-tkabber/facewinking.gif
-%%DATADIR%%/emoticons-tkabber/faceyukky.gif
-%%DATADIR%%/emoticons-tkabber/icondef.xml
-%%DATADIR%%/emoticons.tcl
-%%DATADIR%%/filetransfer.tcl
-%%DATADIR%%/filters.tcl
-%%DATADIR%%/gpgme.tcl
-%%DATADIR%%/hooks.tcl
-%%DATADIR%%/iface.tcl
-%%DATADIR%%/iq.tcl
-%%DATADIR%%/itemedit.tcl
-%%DATADIR%%/jabberlib-tclxml/jabberlib.tcl
-%%DATADIR%%/jabberlib-tclxml/pkgIndex.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/pkgIndex.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/sgml-8.0.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/sgml-8.1.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/sgmlparser.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/tclparser-8.0.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/tclparser-8.1.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/xml-8.0.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/xml-8.1.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/xml__tcl.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/xmldep.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/xpath.tcl
-%%DATADIR%%/jabberlib-tclxml/wrapper.tcl
-%%DATADIR%%/jidlink.tcl
-%%DATADIR%%/joingrdialog.tcl
-%%DATADIR%%/login.tcl
-%%DATADIR%%/mclistbox-1.02/mclistbox.tcl
-%%DATADIR%%/messages.tcl
-%%DATADIR%%/msgs/ca.msg
-%%DATADIR%%/msgs/de.msg
-%%DATADIR%%/msgs/en.msg
-%%DATADIR%%/msgs/eo.msg
-%%DATADIR%%/msgs/es.msg
-%%DATADIR%%/msgs/eu.msg
-%%DATADIR%%/msgs/fr.msg
-%%DATADIR%%/msgs/it.msg
-%%DATADIR%%/msgs/pl.msg
-%%DATADIR%%/msgs/pl.rc
-%%DATADIR%%/msgs/pt.msg
-%%DATADIR%%/msgs/ro.msg
-%%DATADIR%%/msgs/ru.msg
-%%DATADIR%%/msgs/ru.rc
-%%DATADIR%%/msgs/ua.msg
-%%DATADIR%%/muc.tcl
-%%DATADIR%%/negotiate.tcl
-%%DATADIR%%/pixmaps/default/browser/aim_online.gif
-%%DATADIR%%/pixmaps/default/browser/gg_online.gif
-%%DATADIR%%/pixmaps/default/browser/glade-message.gif
-%%DATADIR%%/pixmaps/default/browser/group_on.gif
-%%DATADIR%%/pixmaps/default/browser/icq_online.gif
-%%DATADIR%%/pixmaps/default/browser/jud.gif
-%%DATADIR%%/pixmaps/default/browser/msn_online.gif
-%%DATADIR%%/pixmaps/default/browser/service-jabber.gif
-%%DATADIR%%/pixmaps/default/browser/unknown.gif
-%%DATADIR%%/pixmaps/default/browser/user.gif
-%%DATADIR%%/pixmaps/default/browser/weather_online.gif
-%%DATADIR%%/pixmaps/default/browser/yahoo_online.gif
-%%DATADIR%%/pixmaps/default/docking/available-away.gif
-%%DATADIR%%/pixmaps/default/docking/available-chat.gif
-%%DATADIR%%/pixmaps/default/docking/available-dnd.gif
-%%DATADIR%%/pixmaps/default/docking/available-xa.gif
-%%DATADIR%%/pixmaps/default/docking/available.gif
-%%DATADIR%%/pixmaps/default/docking/invisible.gif
-%%DATADIR%%/pixmaps/default/docking/tkabber.ico
-%%DATADIR%%/pixmaps/default/docking/unavailable.gif
-%%DATADIR%%/pixmaps/default/roster/available-away.gif
-%%DATADIR%%/pixmaps/default/roster/available-chat.gif
-%%DATADIR%%/pixmaps/default/roster/available-dnd.gif
-%%DATADIR%%/pixmaps/default/roster/available-xa.gif
-%%DATADIR%%/pixmaps/default/roster/available.gif
-%%DATADIR%%/pixmaps/default/roster/group-closed.gif
-%%DATADIR%%/pixmaps/default/roster/group-opened.gif
-%%DATADIR%%/pixmaps/default/roster/group_off.gif
-%%DATADIR%%/pixmaps/default/roster/group_on.gif
-%%DATADIR%%/pixmaps/default/roster/invisible.gif
-%%DATADIR%%/pixmaps/default/roster/stalker.gif
-%%DATADIR%%/pixmaps/default/roster/unavailable.gif
-%%DATADIR%%/pixmaps/default/services/aim_away.xpm
-%%DATADIR%%/pixmaps/default/services/aim_chat.xpm
-%%DATADIR%%/pixmaps/default/services/aim_dnd.xpm
-%%DATADIR%%/pixmaps/default/services/aim_offline.xpm
-%%DATADIR%%/pixmaps/default/services/aim_online.xpm
-%%DATADIR%%/pixmaps/default/services/aim_xa.xpm
-%%DATADIR%%/pixmaps/default/services/gg_away.gif
-%%DATADIR%%/pixmaps/default/services/gg_chat.gif
-%%DATADIR%%/pixmaps/default/services/gg_dnd.gif
-%%DATADIR%%/pixmaps/default/services/gg_offline.gif
-%%DATADIR%%/pixmaps/default/services/gg_online.gif
-%%DATADIR%%/pixmaps/default/services/gg_xa.gif
-%%DATADIR%%/pixmaps/default/services/icq_away.xpm
-%%DATADIR%%/pixmaps/default/services/icq_chat.xpm
-%%DATADIR%%/pixmaps/default/services/icq_dnd.xpm
-%%DATADIR%%/pixmaps/default/services/icq_offline.xpm
-%%DATADIR%%/pixmaps/default/services/icq_online.xpm
-%%DATADIR%%/pixmaps/default/services/icq_xa.xpm
-%%DATADIR%%/pixmaps/default/services/msn_away.xpm
-%%DATADIR%%/pixmaps/default/services/msn_chat.xpm
-%%DATADIR%%/pixmaps/default/services/msn_dnd.xpm
-%%DATADIR%%/pixmaps/default/services/msn_offline.xpm
-%%DATADIR%%/pixmaps/default/services/msn_online.xpm
-%%DATADIR%%/pixmaps/default/services/msn_xa.xpm
-%%DATADIR%%/pixmaps/default/services/rss.xpm
-%%DATADIR%%/pixmaps/default/services/rss2.xpm
-%%DATADIR%%/pixmaps/default/services/rss3.xpm
-%%DATADIR%%/pixmaps/default/services/sms.xpm
-%%DATADIR%%/pixmaps/default/services/weather_away.gif
-%%DATADIR%%/pixmaps/default/services/weather_chat.gif
-%%DATADIR%%/pixmaps/default/services/weather_dnd.gif
-%%DATADIR%%/pixmaps/default/services/weather_offline.gif
-%%DATADIR%%/pixmaps/default/services/weather_online.gif
-%%DATADIR%%/pixmaps/default/services/weather_xa.gif
-%%DATADIR%%/pixmaps/default/services/yahoo_away.xpm
-%%DATADIR%%/pixmaps/default/services/yahoo_chat.xpm
-%%DATADIR%%/pixmaps/default/services/yahoo_dnd.xpm
-%%DATADIR%%/pixmaps/default/services/yahoo_offline.xpm
-%%DATADIR%%/pixmaps/default/services/yahoo_online.xpm
-%%DATADIR%%/pixmaps/default/services/yahoo_xa.xpm
-%%DATADIR%%/pixmaps/default/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/default/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/default/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/default/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/default/tkabber/gpg-badsigned.gif
-%%DATADIR%%/pixmaps/default/tkabber/gpg-encrypted.gif
-%%DATADIR%%/pixmaps/default/tkabber/gpg-signed.gif
-%%DATADIR%%/pixmaps/default/tkabber/gpg-unencrypted.gif
-%%DATADIR%%/pixmaps/default/tkabber/gpg-unsigned.gif
-%%DATADIR%%/pixmaps/default/tkabber/jb.gif
-%%DATADIR%%/pixmaps/default/tkabber/mainlogo.gif
-%%DATADIR%%/pixmaps/default/tkabber/new-msg.gif
-%%DATADIR%%/pixmaps/default/tkabber/search_bk.gif
-%%DATADIR%%/pixmaps/default/tkabber/search_case.gif
-%%DATADIR%%/pixmaps/default/tkabber/search_exact.gif
-%%DATADIR%%/pixmaps/default/tkabber/search_fw.gif
-%%DATADIR%%/pixmaps/feather22/roster/available-away.gif
-%%DATADIR%%/pixmaps/feather22/roster/available-chat.gif
-%%DATADIR%%/pixmaps/feather22/roster/available-dnd.gif
-%%DATADIR%%/pixmaps/feather22/roster/available-xa.gif
-%%DATADIR%%/pixmaps/feather22/roster/available.gif
-%%DATADIR%%/pixmaps/feather22/roster/invisible.gif
-%%DATADIR%%/pixmaps/feather22/roster/unavailable.gif
-%%DATADIR%%/pixmaps/gabber/browser/aim_online.gif
-%%DATADIR%%/pixmaps/gabber/browser/glade-message.gif
-%%DATADIR%%/pixmaps/gabber/browser/group_on.gif
-%%DATADIR%%/pixmaps/gabber/browser/icq_online.gif
-%%DATADIR%%/pixmaps/gabber/browser/jud.gif
-%%DATADIR%%/pixmaps/gabber/browser/msn_online.gif
-%%DATADIR%%/pixmaps/gabber/browser/user.gif
-%%DATADIR%%/pixmaps/gabber/browser/yahoo_online.gif
-%%DATADIR%%/pixmaps/gabber/docking/available-away.gif
-%%DATADIR%%/pixmaps/gabber/docking/available-chat.gif
-%%DATADIR%%/pixmaps/gabber/docking/available-dnd.gif
-%%DATADIR%%/pixmaps/gabber/docking/available-xa.gif
-%%DATADIR%%/pixmaps/gabber/docking/available.gif
-%%DATADIR%%/pixmaps/gabber/docking/invisible.gif
-%%DATADIR%%/pixmaps/gabber/docking/tkabber.ico
-%%DATADIR%%/pixmaps/gabber/docking/unavailable.gif
-%%DATADIR%%/pixmaps/gabber/roster/available-away.gif
-%%DATADIR%%/pixmaps/gabber/roster/available-chat.gif
-%%DATADIR%%/pixmaps/gabber/roster/available-dnd.gif
-%%DATADIR%%/pixmaps/gabber/roster/available-xa.gif
-%%DATADIR%%/pixmaps/gabber/roster/available.gif
-%%DATADIR%%/pixmaps/gabber/roster/glade-groupchat-menu.xpm
-%%DATADIR%%/pixmaps/gabber/roster/group-closed.gif
-%%DATADIR%%/pixmaps/gabber/roster/group-opened.gif
-%%DATADIR%%/pixmaps/gabber/roster/group_off.gif
-%%DATADIR%%/pixmaps/gabber/roster/group_on.gif
-%%DATADIR%%/pixmaps/gabber/roster/stalker.gif
-%%DATADIR%%/pixmaps/gabber/roster/unavailable.gif
-%%DATADIR%%/pixmaps/gabber/services/aim_away.xpm
-%%DATADIR%%/pixmaps/gabber/services/aim_chat.xpm
-%%DATADIR%%/pixmaps/gabber/services/aim_dnd.xpm
-%%DATADIR%%/pixmaps/gabber/services/aim_offline.xpm
-%%DATADIR%%/pixmaps/gabber/services/aim_online.xpm
-%%DATADIR%%/pixmaps/gabber/services/aim_xa.xpm
-%%DATADIR%%/pixmaps/gabber/services/icq_away.xpm
-%%DATADIR%%/pixmaps/gabber/services/icq_chat.xpm
-%%DATADIR%%/pixmaps/gabber/services/icq_dnd.xpm
-%%DATADIR%%/pixmaps/gabber/services/icq_offline.xpm
-%%DATADIR%%/pixmaps/gabber/services/icq_online.xpm
-%%DATADIR%%/pixmaps/gabber/services/icq_xa.xpm
-%%DATADIR%%/pixmaps/gabber/services/msn_away.xpm
-%%DATADIR%%/pixmaps/gabber/services/msn_chat.xpm
-%%DATADIR%%/pixmaps/gabber/services/msn_dnd.xpm
-%%DATADIR%%/pixmaps/gabber/services/msn_offline.xpm
-%%DATADIR%%/pixmaps/gabber/services/msn_online.xpm
-%%DATADIR%%/pixmaps/gabber/services/msn_xa.xpm
-%%DATADIR%%/pixmaps/gabber/services/rss.xpm
-%%DATADIR%%/pixmaps/gabber/services/rss2.xpm
-%%DATADIR%%/pixmaps/gabber/services/rss3.xpm
-%%DATADIR%%/pixmaps/gabber/services/sms.xpm
-%%DATADIR%%/pixmaps/gabber/services/yahoo_away.xpm
-%%DATADIR%%/pixmaps/gabber/services/yahoo_chat.xpm
-%%DATADIR%%/pixmaps/gabber/services/yahoo_dnd.xpm
-%%DATADIR%%/pixmaps/gabber/services/yahoo_offline.xpm
-%%DATADIR%%/pixmaps/gabber/services/yahoo_online.xpm
-%%DATADIR%%/pixmaps/gabber/services/yahoo_xa.xpm
-%%DATADIR%%/pixmaps/gabber/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/gabber/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/gabber/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/gabber/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/gabber/tkabber/jb.gif
-%%DATADIR%%/pixmaps/icq/docking/available-away.gif
-%%DATADIR%%/pixmaps/icq/docking/available-chat.gif
-%%DATADIR%%/pixmaps/icq/docking/available-dnd.gif
-%%DATADIR%%/pixmaps/icq/docking/available-xa.gif
-%%DATADIR%%/pixmaps/icq/docking/available.gif
-%%DATADIR%%/pixmaps/icq/docking/invisible.gif
-%%DATADIR%%/pixmaps/icq/docking/unavailable.gif
-%%DATADIR%%/pixmaps/icq/roster/available-away.gif
-%%DATADIR%%/pixmaps/icq/roster/available-chat.gif
-%%DATADIR%%/pixmaps/icq/roster/available-dnd.gif
-%%DATADIR%%/pixmaps/icq/roster/available-xa.gif
-%%DATADIR%%/pixmaps/icq/roster/available.gif
-%%DATADIR%%/pixmaps/icq/roster/invisible.gif
-%%DATADIR%%/pixmaps/icq/roster/message.gif
-%%DATADIR%%/pixmaps/icq/roster/send.gif
-%%DATADIR%%/pixmaps/icq/roster/stalker.gif
-%%DATADIR%%/pixmaps/icq/roster/unavailable.gif
-%%DATADIR%%/pixmaps/icq/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/icq/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/icq/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/icq/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/icq/tkabber/jb.gif
-%%DATADIR%%/pixmaps/icq/tkabber/mainlogo.gif
-%%DATADIR%%/pixmaps/icq/tkabber/new-msg.gif
-%%DATADIR%%/pixmaps/jajc/browser/aim_online.gif
-%%DATADIR%%/pixmaps/jajc/browser/group_on.gif
-%%DATADIR%%/pixmaps/jajc/browser/icq_online.gif
-%%DATADIR%%/pixmaps/jajc/browser/jud.gif
-%%DATADIR%%/pixmaps/jajc/browser/msn_online.gif
-%%DATADIR%%/pixmaps/jajc/browser/user.gif
-%%DATADIR%%/pixmaps/jajc/browser/yahoo_online.gif
-%%DATADIR%%/pixmaps/jajc/docking/tkabber.ico
-%%DATADIR%%/pixmaps/jajc/roster/available-away.gif
-%%DATADIR%%/pixmaps/jajc/roster/available-chat.gif
-%%DATADIR%%/pixmaps/jajc/roster/available-dnd.gif
-%%DATADIR%%/pixmaps/jajc/roster/available-xa.gif
-%%DATADIR%%/pixmaps/jajc/roster/available.gif
-%%DATADIR%%/pixmaps/jajc/roster/group-closed.gif
-%%DATADIR%%/pixmaps/jajc/roster/group-opened.gif
-%%DATADIR%%/pixmaps/jajc/roster/group_closed.gif
-%%DATADIR%%/pixmaps/jajc/roster/group_off.gif
-%%DATADIR%%/pixmaps/jajc/roster/group_on.gif
-%%DATADIR%%/pixmaps/jajc/roster/group_opened.gif
-%%DATADIR%%/pixmaps/jajc/roster/unavailable.gif
-%%DATADIR%%/pixmaps/jajc/services/aim_away.xpm
-%%DATADIR%%/pixmaps/jajc/services/aim_chat.xpm
-%%DATADIR%%/pixmaps/jajc/services/aim_dnd.xpm
-%%DATADIR%%/pixmaps/jajc/services/aim_offline.xpm
-%%DATADIR%%/pixmaps/jajc/services/aim_online.xpm
-%%DATADIR%%/pixmaps/jajc/services/aim_xa.xpm
-%%DATADIR%%/pixmaps/jajc/services/icq_away.xpm
-%%DATADIR%%/pixmaps/jajc/services/icq_chat.xpm
-%%DATADIR%%/pixmaps/jajc/services/icq_dnd.xpm
-%%DATADIR%%/pixmaps/jajc/services/icq_offline.xpm
-%%DATADIR%%/pixmaps/jajc/services/icq_online.xpm
-%%DATADIR%%/pixmaps/jajc/services/icq_xa.xpm
-%%DATADIR%%/pixmaps/jajc/services/msn_away.xpm
-%%DATADIR%%/pixmaps/jajc/services/msn_chat.xpm
-%%DATADIR%%/pixmaps/jajc/services/msn_dnd.xpm
-%%DATADIR%%/pixmaps/jajc/services/msn_offline.xpm
-%%DATADIR%%/pixmaps/jajc/services/msn_online.xpm
-%%DATADIR%%/pixmaps/jajc/services/msn_xa.xpm
-%%DATADIR%%/pixmaps/jajc/services/sms.xpm
-%%DATADIR%%/pixmaps/jajc/services/yahoo_away.xpm
-%%DATADIR%%/pixmaps/jajc/services/yahoo_chat.xpm
-%%DATADIR%%/pixmaps/jajc/services/yahoo_dnd.xpm
-%%DATADIR%%/pixmaps/jajc/services/yahoo_offline.xpm
-%%DATADIR%%/pixmaps/jajc/services/yahoo_online.xpm
-%%DATADIR%%/pixmaps/jajc/services/yahoo_xa.xpm
-%%DATADIR%%/pixmaps/jajc/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/jajc/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/jajc/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/jajc/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/jajc/tkabber/jb.gif
-%%DATADIR%%/pixmaps/jarl/roster/available-away.gif
-%%DATADIR%%/pixmaps/jarl/roster/available-chat.gif
-%%DATADIR%%/pixmaps/jarl/roster/available-dnd.gif
-%%DATADIR%%/pixmaps/jarl/roster/available-xa.gif
-%%DATADIR%%/pixmaps/jarl/roster/available.gif
-%%DATADIR%%/pixmaps/jarl/roster/invisible.gif
-%%DATADIR%%/pixmaps/jarl/roster/unavailable.gif
-%%DATADIR%%/pixmaps/psi/browser/aim_online.gif
-%%DATADIR%%/pixmaps/psi/browser/icq_online.gif
-%%DATADIR%%/pixmaps/psi/browser/msn_online.gif
-%%DATADIR%%/pixmaps/psi/browser/user.gif
-%%DATADIR%%/pixmaps/psi/browser/yahoo_online.gif
-%%DATADIR%%/pixmaps/psi/roster/available-away.gif
-%%DATADIR%%/pixmaps/psi/roster/available-chat.gif
-%%DATADIR%%/pixmaps/psi/roster/available-dnd.gif
-%%DATADIR%%/pixmaps/psi/roster/available-xa.gif
-%%DATADIR%%/pixmaps/psi/roster/available.gif
-%%DATADIR%%/pixmaps/psi/roster/group-closed.gif
-%%DATADIR%%/pixmaps/psi/roster/group-opened.gif
-%%DATADIR%%/pixmaps/psi/roster/stalker.gif
-%%DATADIR%%/pixmaps/psi/roster/unavailable.gif
-%%DATADIR%%/pixmaps/psi/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/psi/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/psi/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/psi/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/psi/tkabber/jb.gif
-%%DATADIR%%/plugins.tcl
-%%DATADIR%%/plugins/chat/clear.tcl
-%%DATADIR%%/plugins/chat/complete_last_nick.tcl
-%%DATADIR%%/plugins/chat/completion.tcl
-%%DATADIR%%/plugins/chat/draw_encrypted.tcl
-%%DATADIR%%/plugins/chat/draw_error.tcl
-%%DATADIR%%/plugins/chat/draw_info.tcl
-%%DATADIR%%/plugins/chat/draw_message.tcl
-%%DATADIR%%/plugins/chat/draw_normal_message.tcl
-%%DATADIR%%/plugins/chat/draw_server_message.tcl
-%%DATADIR%%/plugins/chat/draw_signed.tcl
-%%DATADIR%%/plugins/chat/draw_timestamp.tcl
-%%DATADIR%%/plugins/chat/draw_xhtml_message.tcl
-%%DATADIR%%/plugins/chat/empty_body.tcl
-%%DATADIR%%/plugins/chat/events.tcl
-%%DATADIR%%/plugins/chat/exec_command.tcl
-%%DATADIR%%/plugins/chat/highlight.tcl
-%%DATADIR%%/plugins/chat/history.tcl
-%%DATADIR%%/plugins/chat/info_commands.tcl
-%%DATADIR%%/plugins/chat/logger.tcl
-%%DATADIR%%/plugins/chat/me_command.tcl
-%%DATADIR%%/plugins/chat/nick_command.tcl
-%%DATADIR%%/plugins/chat/send_message.tcl
-%%DATADIR%%/plugins/chat/unisymbols.tcl
-%%DATADIR%%/plugins/general/autoaway.tcl
-%%DATADIR%%/plugins/general/clientinfo.tcl
-%%DATADIR%%/plugins/general/conferenceinfo.tcl
-%%DATADIR%%/plugins/general/message_archive.tcl
-%%DATADIR%%/plugins/general/presenceinfo.tcl
-%%DATADIR%%/plugins/general/rawxml.tcl
-%%DATADIR%%/plugins/general/stats.tcl
-%%DATADIR%%/plugins/general/tkcon.tcl
-%%DATADIR%%/plugins/iq/browse.tcl
-%%DATADIR%%/plugins/iq/last.tcl
-%%DATADIR%%/plugins/iq/oob.tcl
-%%DATADIR%%/plugins/iq/time.tcl
-%%DATADIR%%/plugins/iq/version.tcl
-%%DATADIR%%/plugins/jidlink/dtcp.tcl
-%%DATADIR%%/plugins/jidlink/ibb.tcl
-%%DATADIR%%/plugins/unix/dockingtray.tcl
-%%DATADIR%%/plugins/unix/ispell.tcl
-%%DATADIR%%/plugins/unix/menu.tcl
-%%DATADIR%%/plugins/unix/menu8.4.tcl
-%%DATADIR%%/plugins/unix/wmdock.tcl
-%%DATADIR%%/plugins/windows/mousewheel.tcl
-%%DATADIR%%/plugins/windows/taskbar.tcl
-%%DATADIR%%/presence.tcl
-%%DATADIR%%/privacy.tcl
-%%DATADIR%%/register.tcl
-%%DATADIR%%/roster.tcl
-%%DATADIR%%/search.tcl
-%%DATADIR%%/sound.tcl
-%%DATADIR%%/sounds/default/chat_their_message.wav
-%%DATADIR%%/sounds/default/connected.wav
-%%DATADIR%%/sounds/default/groupchat_server_message.wav
-%%DATADIR%%/sounds/default/groupchat_their_message.wav
-%%DATADIR%%/sounds/default/groupchat_their_message_to_me.wav
-%%DATADIR%%/sounds/default/presence_available.wav
-%%DATADIR%%/sounds/default/presence_unavailable.wav
-%%DATADIR%%/sounds/psi/chat_their_message.wav
-%%DATADIR%%/sounds/psi/connected.wav
-%%DATADIR%%/sounds/psi/groupchat_server_message.wav
-%%DATADIR%%/sounds/psi/groupchat_their_message.wav
-%%DATADIR%%/sounds/psi/groupchat_their_message_to_me.wav
-%%DATADIR%%/sounds/psi/presence_available.wav
-%%DATADIR%%/sounds/psi/presence_unavailable.wav
-%%DATADIR%%/splash.tcl
-%%DATADIR%%/textundo/dkflib.tcl
-%%DATADIR%%/textundo/textundo.tcl
-%%DATADIR%%/tkabber.tcl
-%%DATADIR%%/userinfo.tcl
-%%DATADIR%%/utils.tcl
-%%DATADIR%%/xmppmime.tcl
-%%EXAMPLESDIR%%/badlop-config-home.tcl
-%%EXAMPLESDIR%%/badlop-config.tcl
-%%EXAMPLESDIR%%/badlop-dark.xrdb
-%%EXAMPLESDIR%%/black.xrdb
-%%EXAMPLESDIR%%/config.tcl
-%%EXAMPLESDIR%%/dark.xrdb
-%%EXAMPLESDIR%%/dark2.xrdb
-%%EXAMPLESDIR%%/ermine.xrdb
-%%EXAMPLESDIR%%/green.xrdb
-%%EXAMPLESDIR%%/ice.xrdb
-%%EXAMPLESDIR%%/light.xrdb
-%%EXAMPLESDIR%%/mtr-config.tcl
-%%EXAMPLESDIR%%/teo-config.tcl
-%%EXAMPLESDIR%%/teopetuk.xrdb
-%%EXAMPLESDIR%%/tkabber_setstatus
-%%EXAMPLESDIR%%/tools/howto.txt
-%%EXAMPLESDIR%%/tools/jbot
-%%EXAMPLESDIR%%/tools/jsend.tcl
-%%EXAMPLESDIR%%/tools/rssbot
-%%EXAMPLESDIR%%/tools/rssbot.tcl
-%%EXAMPLESDIR%%/warm.xrdb
-%%PORTDOCS%%%%DOCSDIR%%/tkabber.html
-%%PORTDOCS%%%%DOCSDIR%%/tkabber.xml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/aniemoteicons
-@dirrm %%DATADIR%%/emoticons-tkabber
-@dirrm %%DATADIR%%/jabberlib-tclxml/tclxml
-@dirrm %%DATADIR%%/jabberlib-tclxml
-@dirrm %%DATADIR%%/mclistbox-1.02
-@dirrm %%DATADIR%%/msgs
-@dirrm %%DATADIR%%/pixmaps/default/browser
-@dirrm %%DATADIR%%/pixmaps/default/docking
-@dirrm %%DATADIR%%/pixmaps/default/roster
-@dirrm %%DATADIR%%/pixmaps/default/services
-@dirrm %%DATADIR%%/pixmaps/default/tkabber
-@dirrm %%DATADIR%%/pixmaps/default
-@dirrm %%DATADIR%%/pixmaps/feather22/roster
-@dirrm %%DATADIR%%/pixmaps/feather22
-@dirrm %%DATADIR%%/pixmaps/gabber/browser
-@dirrm %%DATADIR%%/pixmaps/gabber/docking
-@dirrm %%DATADIR%%/pixmaps/gabber/roster
-@dirrm %%DATADIR%%/pixmaps/gabber/services
-@dirrm %%DATADIR%%/pixmaps/gabber/tkabber
-@dirrm %%DATADIR%%/pixmaps/gabber
-@dirrm %%DATADIR%%/pixmaps/icq/docking
-@dirrm %%DATADIR%%/pixmaps/icq/roster
-@dirrm %%DATADIR%%/pixmaps/icq/tkabber
-@dirrm %%DATADIR%%/pixmaps/icq
-@dirrm %%DATADIR%%/pixmaps/jajc/browser
-@dirrm %%DATADIR%%/pixmaps/jajc/docking
-@dirrm %%DATADIR%%/pixmaps/jajc/roster
-@dirrm %%DATADIR%%/pixmaps/jajc/services
-@dirrm %%DATADIR%%/pixmaps/jajc/tkabber
-@dirrm %%DATADIR%%/pixmaps/jajc
-@dirrm %%DATADIR%%/pixmaps/jarl/roster
-@dirrm %%DATADIR%%/pixmaps/jarl
-@dirrm %%DATADIR%%/pixmaps/psi/browser
-@dirrm %%DATADIR%%/pixmaps/psi/roster
-@dirrm %%DATADIR%%/pixmaps/psi/tkabber
-@dirrm %%DATADIR%%/pixmaps/psi
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/plugins/chat
-@dirrm %%DATADIR%%/plugins/general
-@dirrm %%DATADIR%%/plugins/iq
-@dirrm %%DATADIR%%/plugins/jidlink
-@dirrm %%DATADIR%%/plugins/unix
-@dirrm %%DATADIR%%/plugins/windows
-@dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/sounds/default
-@dirrm %%DATADIR%%/sounds/psi
-@dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%/textundo
-@dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%/tools
-@dirrm %%EXAMPLESDIR%%
diff --git a/net/trafshow3/Makefile b/net/trafshow3/Makefile
deleted file mode 100644
index d5dd5b66d62b..000000000000
--- a/net/trafshow3/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# New ports collection makefile for:	trafshow
-# Date created:         25 September 1996
-# Whom:                 igor@zynaps.ru
-#
-# $FreeBSD$
-#
-
-PORTNAME=	trafshow
-PORTVERSION=	3.1
-PORTREVISION=	3
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.sasknow.com/pub/trafshow/ \
-		ftp://ftp.nsk.su/pub/RinetSoftware/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	ryan@sasknow.com
-COMMENT=	Full screen visualization of network traffic
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_TRAFSHOW_SLANG) || \
-    (exists(${LOCALBASE}/lib/libslang.a) && !defined(WITHOUT_TRAFSHOW_SLANG))
-LIB_DEPENDS=   slang.1:${PORTSDIR}/devel/libslang
-.else
-.if ${OSVERSION} < 400010
-LIB_DEPENDS=	ncurses.5:${PORTSDIR}/devel/ncurses
-.endif
-.endif
-
-USE_REINPLACE=	yes
-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:
-	@${REINPLACE_CMD} -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 c7c38bea360e..000000000000
--- a/net/trafshow3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (trafshow-3.1.tgz) = 085b99f160002a269b358aab1c5004f0
-SIZE (trafshow-3.1.tgz) = 72342
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/files/patch-ag b/net/trafshow3/files/patch-ag
deleted file mode 100644
index b4003dcf9649..000000000000
--- a/net/trafshow3/files/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
---- util.c.orig	Fri Sep 15 06:51:11 2000
-+++ util.c	Thu Sep 21 14:35:33 2000
-@@ -129,6 +129,9 @@
- #ifdef	IPPROTO_ENCAP
- 	{ "encap",IPPROTO_ENCAP},
- #endif
-+#ifdef	IPPROTO_IPV6
-+	{ "ipv6", IPPROTO_IPV6},
-+#endif
- 	{ "ip",   IPPROTO_IP   },
- 	{ "raw",  IPPROTO_RAW  },
- 	{ NULL, -1 },
diff --git a/net/trafshow3/files/patch-ah b/net/trafshow3/files/patch-ah
deleted file mode 100644
index c8c69ae713c9..000000000000
--- a/net/trafshow3/files/patch-ah
+++ /dev/null
@@ -1,119 +0,0 @@
---- display.c.orig	Sun Aug 23 21:51:48 1998
-+++ display.c	Fri Dec  6 12:17:55 2002
-@@ -54,6 +54,7 @@
- static int l_nflag, l_eflag;
- static int n_entries;
- static int err_pos;
-+extern struct t_entry t_mask;  /* traffic mask */
- 
- void
- init_display(reinit)
-@@ -282,6 +284,13 @@
- 	packets_total++;
- 	bytes_total += e->bytes;
- 	j = page * page_size;
-+
-+	e->src.s_addr &= t_mask.src.s_addr;
-+	e->dst.s_addr &= t_mask.dst.s_addr;
-+	e->sport &= t_mask.sport;
-+	e->dport &= t_mask.dport;
-+	e->proto &= t_mask.proto;
-+
- 	for (i = 0; i < n_entry; i++) {
- 		if (memcmp(&e->eh, &entries[i].eh, sizeof(e->eh)) == 0 &&
- 		    e->src.s_addr == entries[i].src.s_addr &&
---- trafshow.c.orig	Fri Aug 28 00:15:57 1998
-+++ trafshow.c	Fri Dec  6 12:34:09 2002
-@@ -48,6 +48,7 @@
- int pflag = 0;		/* don't put the interface into promiscuous mode */
- int kflag = 1;		/* disable keyboard input checking */
- int eflag = 0;		/* show ethernet traffic rather than ip */
-+struct t_entry t_mask;	/* traffic mask */
- 
- /* global variables */
- char *program_name;		/* myself */
-@@ -78,6 +79,12 @@
- 	extern int abort_on_misalignment();
- 	extern pcap_handler lookup_if();
- 
-+	t_mask.src.s_addr = 0xffffffff;	/* all bits valid */
-+	t_mask.dst.s_addr = 0xffffffff;	/* all bits valid */
-+	t_mask.sport = 0xffff;		/* all bits valid */
-+	t_mask.dport = 0xffff;		/* all bits valid */
-+	t_mask.proto = 0xffff;		/* all bits valid */
-+
- 	cnt = -1;
- 	device_name = NULL;
- 	infile = NULL;
-@@ -94,7 +87,7 @@
- 
- 	if (abort_on_misalignment(ebuf) < 0) error(0, ebuf);
- 
--	while ((op = getopt(argc, argv, "c:CefF:i:knNOpr:t:vh?")) != EOF)
-+	while ((op = getopt(argc, argv, "c:CefF:i:kmnNOpr:t:vh?")) != EOF)
- 		switch (op) {
- 		case 'C':
- #ifdef	HAVE_SLCURSES
-@@ -114,6 +121,40 @@
- 			break;
- 		case 'k':
- 			kflag = 0;
-+			break;
-+		case 'm':
-+			t_mask.src.s_addr = 0;
-+			t_mask.dst.s_addr = 0;
-+			t_mask.sport = 0;
-+			t_mask.dport = 0;
-+			t_mask.proto = 0;
-+			for (;optind + 1 <= argc;) {
-+			    char *s = argv[optind];
-+			    u_int32_t arg = 0xffffffff;
-+			    int save=optind;
-+			    
-+			    optind++;
-+			    if (optind + 1 <= argc &&
-+				    isdigit(*(argv[optind])) ) {
-+				arg = strtoul(argv[optind], NULL, 0);
-+				optind++;
-+			    }
-+				
-+			    if (!strcmp(s, "src-ip"))
-+				t_mask.src.s_addr = htonl(arg);
-+			    else if (!strcmp(s, "dst-ip"))
-+				t_mask.dst.s_addr = htonl(arg);
-+			    else if (!strcmp(s, "src-port"))
-+				t_mask.sport = htons((u_short)(arg));
-+			    else if (!strcmp(s, "dst-port"))
-+				t_mask.dport = htons((u_short)(arg));
-+			    else if (!strcmp(s, "proto"))
-+				t_mask.proto = arg;
-+			    else {
-+				optind = save;
-+				break;
-+			    }
-+			}
- 			break;
- 		case 'n':
- 			++nflag;
---- trafshow.1.orig	Fri Aug 28 09:37:38 1998
-+++ trafshow.1	Tue Apr 15 22:32:21 2003
-@@ -42,6 +42,16 @@
- .B \-k
- Disable input keyboard checking. It is intended to avoid loss of packets.
- .TP
-+.B \-m
-+[src-ip M] [dst-ip M] [src-port M] [dst-port M] [proto M]
-+.br
-+Mask the specified field with mask M (which should be specified
-+as an hex number e.g. 0xffff0000) before further processing
-+of the packet. This allows to aggregate traffic in the display
-+to ease analysis.
-+.br
-+.The masks for all field not specified will be set to 0.
-+.TP
- .B \-n
- Don't convert host addresses and port numbers to names.
- .TP
-
-
-
diff --git a/net/trafshow3/files/patch-configure b/net/trafshow3/files/patch-configure
deleted file mode 100644
index 8510310f4a13..000000000000
--- a/net/trafshow3/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sat Jan  5 17:07:53 2002
-+++ configure	Sat Jan  5 17:07:53 2002
-@@ -874,7 +874,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_cv_lbl_gcc_vers=`$CC -v 2>&1 | \
--			    sed -n -e '$s/.* //' -e '$s/\..*//p'`
-+			    sed -n -e '$s/^.*version //' -e '$s/\..*//p'`
- fi
- 
- 		    echo "$ac_t""$ac_cv_lbl_gcc_vers" 1>&6
diff --git a/net/trafshow3/pkg-descr b/net/trafshow3/pkg-descr
deleted file mode 100644
index c3121121390e..000000000000
--- a/net/trafshow3/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-TrafShow continuously displays the information regarding packet
-traffic on the configured network interface that matches the boolean
-expression. It periodically sorts and updates this information. It
-may be useful for locating suspicious network traffic on the net.
-
-WWW: http://soft.risp.ru/trafshow/index_en.shtml
-
-- Ryan Thompson <ryan@sasknow.com>
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 d5dd5b66d62b..000000000000
--- a/net/trafshow4/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# New ports collection makefile for:	trafshow
-# Date created:         25 September 1996
-# Whom:                 igor@zynaps.ru
-#
-# $FreeBSD$
-#
-
-PORTNAME=	trafshow
-PORTVERSION=	3.1
-PORTREVISION=	3
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.sasknow.com/pub/trafshow/ \
-		ftp://ftp.nsk.su/pub/RinetSoftware/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	ryan@sasknow.com
-COMMENT=	Full screen visualization of network traffic
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_TRAFSHOW_SLANG) || \
-    (exists(${LOCALBASE}/lib/libslang.a) && !defined(WITHOUT_TRAFSHOW_SLANG))
-LIB_DEPENDS=   slang.1:${PORTSDIR}/devel/libslang
-.else
-.if ${OSVERSION} < 400010
-LIB_DEPENDS=	ncurses.5:${PORTSDIR}/devel/ncurses
-.endif
-.endif
-
-USE_REINPLACE=	yes
-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:
-	@${REINPLACE_CMD} -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 c7c38bea360e..000000000000
--- a/net/trafshow4/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (trafshow-3.1.tgz) = 085b99f160002a269b358aab1c5004f0
-SIZE (trafshow-3.1.tgz) = 72342
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/files/patch-ag b/net/trafshow4/files/patch-ag
deleted file mode 100644
index b4003dcf9649..000000000000
--- a/net/trafshow4/files/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
---- util.c.orig	Fri Sep 15 06:51:11 2000
-+++ util.c	Thu Sep 21 14:35:33 2000
-@@ -129,6 +129,9 @@
- #ifdef	IPPROTO_ENCAP
- 	{ "encap",IPPROTO_ENCAP},
- #endif
-+#ifdef	IPPROTO_IPV6
-+	{ "ipv6", IPPROTO_IPV6},
-+#endif
- 	{ "ip",   IPPROTO_IP   },
- 	{ "raw",  IPPROTO_RAW  },
- 	{ NULL, -1 },
diff --git a/net/trafshow4/files/patch-ah b/net/trafshow4/files/patch-ah
deleted file mode 100644
index c8c69ae713c9..000000000000
--- a/net/trafshow4/files/patch-ah
+++ /dev/null
@@ -1,119 +0,0 @@
---- display.c.orig	Sun Aug 23 21:51:48 1998
-+++ display.c	Fri Dec  6 12:17:55 2002
-@@ -54,6 +54,7 @@
- static int l_nflag, l_eflag;
- static int n_entries;
- static int err_pos;
-+extern struct t_entry t_mask;  /* traffic mask */
- 
- void
- init_display(reinit)
-@@ -282,6 +284,13 @@
- 	packets_total++;
- 	bytes_total += e->bytes;
- 	j = page * page_size;
-+
-+	e->src.s_addr &= t_mask.src.s_addr;
-+	e->dst.s_addr &= t_mask.dst.s_addr;
-+	e->sport &= t_mask.sport;
-+	e->dport &= t_mask.dport;
-+	e->proto &= t_mask.proto;
-+
- 	for (i = 0; i < n_entry; i++) {
- 		if (memcmp(&e->eh, &entries[i].eh, sizeof(e->eh)) == 0 &&
- 		    e->src.s_addr == entries[i].src.s_addr &&
---- trafshow.c.orig	Fri Aug 28 00:15:57 1998
-+++ trafshow.c	Fri Dec  6 12:34:09 2002
-@@ -48,6 +48,7 @@
- int pflag = 0;		/* don't put the interface into promiscuous mode */
- int kflag = 1;		/* disable keyboard input checking */
- int eflag = 0;		/* show ethernet traffic rather than ip */
-+struct t_entry t_mask;	/* traffic mask */
- 
- /* global variables */
- char *program_name;		/* myself */
-@@ -78,6 +79,12 @@
- 	extern int abort_on_misalignment();
- 	extern pcap_handler lookup_if();
- 
-+	t_mask.src.s_addr = 0xffffffff;	/* all bits valid */
-+	t_mask.dst.s_addr = 0xffffffff;	/* all bits valid */
-+	t_mask.sport = 0xffff;		/* all bits valid */
-+	t_mask.dport = 0xffff;		/* all bits valid */
-+	t_mask.proto = 0xffff;		/* all bits valid */
-+
- 	cnt = -1;
- 	device_name = NULL;
- 	infile = NULL;
-@@ -94,7 +87,7 @@
- 
- 	if (abort_on_misalignment(ebuf) < 0) error(0, ebuf);
- 
--	while ((op = getopt(argc, argv, "c:CefF:i:knNOpr:t:vh?")) != EOF)
-+	while ((op = getopt(argc, argv, "c:CefF:i:kmnNOpr:t:vh?")) != EOF)
- 		switch (op) {
- 		case 'C':
- #ifdef	HAVE_SLCURSES
-@@ -114,6 +121,40 @@
- 			break;
- 		case 'k':
- 			kflag = 0;
-+			break;
-+		case 'm':
-+			t_mask.src.s_addr = 0;
-+			t_mask.dst.s_addr = 0;
-+			t_mask.sport = 0;
-+			t_mask.dport = 0;
-+			t_mask.proto = 0;
-+			for (;optind + 1 <= argc;) {
-+			    char *s = argv[optind];
-+			    u_int32_t arg = 0xffffffff;
-+			    int save=optind;
-+			    
-+			    optind++;
-+			    if (optind + 1 <= argc &&
-+				    isdigit(*(argv[optind])) ) {
-+				arg = strtoul(argv[optind], NULL, 0);
-+				optind++;
-+			    }
-+				
-+			    if (!strcmp(s, "src-ip"))
-+				t_mask.src.s_addr = htonl(arg);
-+			    else if (!strcmp(s, "dst-ip"))
-+				t_mask.dst.s_addr = htonl(arg);
-+			    else if (!strcmp(s, "src-port"))
-+				t_mask.sport = htons((u_short)(arg));
-+			    else if (!strcmp(s, "dst-port"))
-+				t_mask.dport = htons((u_short)(arg));
-+			    else if (!strcmp(s, "proto"))
-+				t_mask.proto = arg;
-+			    else {
-+				optind = save;
-+				break;
-+			    }
-+			}
- 			break;
- 		case 'n':
- 			++nflag;
---- trafshow.1.orig	Fri Aug 28 09:37:38 1998
-+++ trafshow.1	Tue Apr 15 22:32:21 2003
-@@ -42,6 +42,16 @@
- .B \-k
- Disable input keyboard checking. It is intended to avoid loss of packets.
- .TP
-+.B \-m
-+[src-ip M] [dst-ip M] [src-port M] [dst-port M] [proto M]
-+.br
-+Mask the specified field with mask M (which should be specified
-+as an hex number e.g. 0xffff0000) before further processing
-+of the packet. This allows to aggregate traffic in the display
-+to ease analysis.
-+.br
-+.The masks for all field not specified will be set to 0.
-+.TP
- .B \-n
- Don't convert host addresses and port numbers to names.
- .TP
-
-
-
diff --git a/net/trafshow4/files/patch-configure b/net/trafshow4/files/patch-configure
deleted file mode 100644
index 8510310f4a13..000000000000
--- a/net/trafshow4/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sat Jan  5 17:07:53 2002
-+++ configure	Sat Jan  5 17:07:53 2002
-@@ -874,7 +874,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_cv_lbl_gcc_vers=`$CC -v 2>&1 | \
--			    sed -n -e '$s/.* //' -e '$s/\..*//p'`
-+			    sed -n -e '$s/^.*version //' -e '$s/\..*//p'`
- fi
- 
- 		    echo "$ac_t""$ac_cv_lbl_gcc_vers" 1>&6
diff --git a/net/trafshow4/pkg-descr b/net/trafshow4/pkg-descr
deleted file mode 100644
index c3121121390e..000000000000
--- a/net/trafshow4/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-TrafShow continuously displays the information regarding packet
-traffic on the configured network interface that matches the boolean
-expression. It periodically sorts and updates this information. It
-may be useful for locating suspicious network traffic on the net.
-
-WWW: http://soft.risp.ru/trafshow/index_en.shtml
-
-- Ryan Thompson <ryan@sasknow.com>
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/tshark-lite/Makefile b/net/tshark-lite/Makefile
deleted file mode 100644
index f83d5e3916cf..000000000000
--- a/net/tshark-lite/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# New ports collection makefile for:   tethereal-lite
-# Date created:        20 March 2004
-# Whom:                Bill Fumerola <billf@mu.org>
-#
-# $FreeBSD$
-#
-
-LITE=		yes
-PKGNAMESUFFIX=	-lite
-
-MASTERDIR=	${.CURDIR}/../tethereal
-COMMENT=        A powerful network analyzer/capture tool (lite package)
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/tshark/Makefile b/net/tshark/Makefile
deleted file mode 100644
index 64e7f0216b31..000000000000
--- a/net/tshark/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for:   tethereal
-# Date created:        4 February 2002
-# Whom:                Bill Fumerola <billf@mu.org>
-# A slave of ports collection makefile for:   ethereal
-# Date created:        10 August 1998
-# Whom:                Bill Fumerola <billf@chc-chimes.com>
-#
-# $FreeBSD$
-#
-
-PKGNAMEPREFIX=	t
-CATEGORIES=	net ipv6
-
-MASTERDIR=	${.CURDIR}/../ethereal
-
-WITHOUT_X11=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
deleted file mode 100644
index b3de6afbdb4c..000000000000
--- a/net/unison-devel/Makefile
+++ /dev/null
@@ -1,39 +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.9.20
-PORTREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/${DIST_SUBDIR}/
-DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
-EXTRACT_ONLY=	src.tar.gz
-
-MAINTAINER=	daniel+unison@pelleg.org
-COMMENT=	A user-level file synchronization tool
-
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
-
-USE_GMAKE=	yes
-MAKE_ARGS=	UISTYLE=text CFLAGS=""
-
-.if !defined(NOPORTDOCS)
-DOCS=		BUGS.txt NEWS README
-EXTRA_DOCS=	unison-manual.dvi unison-manual.html \
-		unison-manual.pdf unison-manual.ps
-.endif
-
-post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/unison
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/unison-devel/distinfo b/net/unison-devel/distinfo
deleted file mode 100644
index 1044547f1238..000000000000
--- a/net/unison-devel/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (unison-2.9.20/src.tar.gz) = a0a1b734e11212623bc6ea996aace960
-SIZE (unison-2.9.20/src.tar.gz) = 363079
-MD5 (unison-2.9.20/unison-manual.dvi) = 9d51f63ad9b592f4e94f593f682b4533
-SIZE (unison-2.9.20/unison-manual.dvi) = 248060
-MD5 (unison-2.9.20/unison-manual.html) = babc84fe1729382c9569a7cc0dfd7851
-SIZE (unison-2.9.20/unison-manual.html) = 209167
-MD5 (unison-2.9.20/unison-manual.pdf) = 4f85a8fb7c2587d5f8e8184b49d90636
-SIZE (unison-2.9.20/unison-manual.pdf) = 332136
-MD5 (unison-2.9.20/unison-manual.ps) = db69ed340c6e88a56890ef37804ee3ed
-SIZE (unison-2.9.20/unison-manual.ps) = 440361
diff --git a/net/unison-devel/files/patch-aa b/net/unison-devel/files/patch-aa
deleted file mode 100644
index a14c18bfa972..000000000000
--- a/net/unison-devel/files/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.orig	Tue Aug 28 16:27:01 2001
-+++ Makefile	Wed Aug 29 09:15:09 2001
-@@ -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)
- 	@# If we're running at Penn, install a public version too
- 	if [ -d /plclub/bin ]; then cp $(NAME)$(EXEC_EXT) /plclub/bin/$(NAME)-$(VERSION)$(EXEC_EXT); fi
- 
-@@ -231,7 +231,7 @@
- tags:
- 	-$(ETAGS) *.ml *.mli *.txt
- 
--all:: TAGS
-+#all:: TAGS
- 
- TAGS: 
- 	$(MAKE) tags
diff --git a/net/unison-devel/pkg-descr b/net/unison-devel/pkg-descr
deleted file mode 100644
index 10d805d9eb0a..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
-
-daniel+unison@pelleg.org
diff --git a/net/unison-devel/pkg-plist b/net/unison-devel/pkg-plist
deleted file mode 100644
index 5c8fc8567c8f..000000000000
--- a/net/unison-devel/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/unison
-%%PORTDOCS%%%%DOCSDIR%%/BUGS.txt
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/unison-manual.dvi
-%%PORTDOCS%%%%DOCSDIR%%/unison-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/unison-manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/unison-manual.ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/unison232/Makefile b/net/unison232/Makefile
deleted file mode 100644
index b3de6afbdb4c..000000000000
--- a/net/unison232/Makefile
+++ /dev/null
@@ -1,39 +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.9.20
-PORTREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/${DIST_SUBDIR}/
-DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
-EXTRACT_ONLY=	src.tar.gz
-
-MAINTAINER=	daniel+unison@pelleg.org
-COMMENT=	A user-level file synchronization tool
-
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
-
-USE_GMAKE=	yes
-MAKE_ARGS=	UISTYLE=text CFLAGS=""
-
-.if !defined(NOPORTDOCS)
-DOCS=		BUGS.txt NEWS README
-EXTRA_DOCS=	unison-manual.dvi unison-manual.html \
-		unison-manual.pdf unison-manual.ps
-.endif
-
-post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/unison
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/unison232/distinfo b/net/unison232/distinfo
deleted file mode 100644
index 1044547f1238..000000000000
--- a/net/unison232/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (unison-2.9.20/src.tar.gz) = a0a1b734e11212623bc6ea996aace960
-SIZE (unison-2.9.20/src.tar.gz) = 363079
-MD5 (unison-2.9.20/unison-manual.dvi) = 9d51f63ad9b592f4e94f593f682b4533
-SIZE (unison-2.9.20/unison-manual.dvi) = 248060
-MD5 (unison-2.9.20/unison-manual.html) = babc84fe1729382c9569a7cc0dfd7851
-SIZE (unison-2.9.20/unison-manual.html) = 209167
-MD5 (unison-2.9.20/unison-manual.pdf) = 4f85a8fb7c2587d5f8e8184b49d90636
-SIZE (unison-2.9.20/unison-manual.pdf) = 332136
-MD5 (unison-2.9.20/unison-manual.ps) = db69ed340c6e88a56890ef37804ee3ed
-SIZE (unison-2.9.20/unison-manual.ps) = 440361
diff --git a/net/unison232/files/patch-aa b/net/unison232/files/patch-aa
deleted file mode 100644
index a14c18bfa972..000000000000
--- a/net/unison232/files/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.orig	Tue Aug 28 16:27:01 2001
-+++ Makefile	Wed Aug 29 09:15:09 2001
-@@ -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)
- 	@# If we're running at Penn, install a public version too
- 	if [ -d /plclub/bin ]; then cp $(NAME)$(EXEC_EXT) /plclub/bin/$(NAME)-$(VERSION)$(EXEC_EXT); fi
- 
-@@ -231,7 +231,7 @@
- tags:
- 	-$(ETAGS) *.ml *.mli *.txt
- 
--all:: TAGS
-+#all:: TAGS
- 
- TAGS: 
- 	$(MAKE) tags
diff --git a/net/unison232/pkg-descr b/net/unison232/pkg-descr
deleted file mode 100644
index 10d805d9eb0a..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
-
-daniel+unison@pelleg.org
diff --git a/net/unison232/pkg-plist b/net/unison232/pkg-plist
deleted file mode 100644
index 5c8fc8567c8f..000000000000
--- a/net/unison232/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/unison
-%%PORTDOCS%%%%DOCSDIR%%/BUGS.txt
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/unison-manual.dvi
-%%PORTDOCS%%%%DOCSDIR%%/unison-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/unison-manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/unison-manual.ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/valknut/Makefile b/net/valknut/Makefile
deleted file mode 100644
index 22ee6af6c17b..000000000000
--- a/net/valknut/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:    dclib
-# Date created:                         Wed 10 Jul 2002
-# Whom:	Sverrir Valgeirsson <e96sv@yahoo.se> and
-#	Amar Takhar <verm@drunkmonk.net> et al
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dcgui
-PORTVERSION=	0.2.21
-CATEGORIES=	net
-MASTER_SITES=	http://download.berlios.de/dcgui/
-DISTNAME=	dcgui-qt-${PORTVERSION}
-
-MAINTAINER=	markus@FreeBSD.org
-COMMENT=	A Direct Connect client QT GUI
-
-LIB_DEPENDS=	dc.0:${PORTSDIR}/net/dclib \
-		xml2.5:${PORTSDIR}/textproc/libxml2
-
-USE_X_PREFIX=	yes
-USE_QT_VER=	3
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libdc=${LOCALBASE}
-
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-post-patch:
-	@${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/net/valknut/distinfo b/net/valknut/distinfo
deleted file mode 100644
index c77a295410fe..000000000000
--- a/net/valknut/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (dcgui-qt-0.2.21.tar.bz2) = 208176fd00286ed8f110cbe6b3cad9cc
-SIZE (dcgui-qt-0.2.21.tar.bz2) = 909134
diff --git a/net/valknut/pkg-descr b/net/valknut/pkg-descr
deleted file mode 100644
index bc60949e63a7..000000000000
--- a/net/valknut/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-This is a QT frontend to the Direct Connect system. It supports
-most if not all of the DC features.
-
-WWW: http://dc.ketelhot.de/
-
-- sverrir
-e96sv@yahoo.se
diff --git a/net/valknut/pkg-message b/net/valknut/pkg-message
deleted file mode 100644
index e42006269a46..000000000000
--- a/net/valknut/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-**********************************************************************
-
- dcgui might dump core when being closed. However this has no impact
- on functionality as well as saving settings. This is a known problem
- and being worked on.
-
-**********************************************************************
diff --git a/net/valknut/pkg-plist b/net/valknut/pkg-plist
deleted file mode 100644
index 8ba57483cbc1..000000000000
--- a/net/valknut/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-bin/dcgui-qt
-share/dcgui/emoticons/emotes.xml
-share/dcgui/emoticons/emoticons.xpm
-share/dcgui/translation/dcgui.cs.qm
-share/dcgui/translation/dcgui.da.qm
-share/dcgui/translation/dcgui.de.qm
-share/dcgui/translation/dcgui.en_GB.qm
-share/dcgui/translation/dcgui.es.qm
-share/dcgui/translation/dcgui.fi.qm
-share/dcgui/translation/dcgui.fr.qm
-share/dcgui/translation/dcgui.hu.qm
-share/dcgui/translation/dcgui.is.qm
-share/dcgui/translation/dcgui.it.qm
-share/dcgui/translation/dcgui.lv.qm
-share/dcgui/translation/dcgui.nb.qm
-share/dcgui/translation/dcgui.nl.qm
-share/dcgui/translation/dcgui.pl.qm
-share/dcgui/translation/dcgui.ro.qm
-share/dcgui/translation/dcgui.rus.qm
-share/dcgui/translation/dcgui.sk.qm
-share/dcgui/translation/dcgui.sv.qm
-@dirrm share/dcgui/translation
-@dirrm share/dcgui/emoticons
-@dirrm share/dcgui
diff --git a/net/wb/Makefile b/net/wb/Makefile
deleted file mode 100644
index 4f865b3f9338..000000000000
--- a/net/wb/Makefile
+++ /dev/null
@@ -1,48 +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
-COMMENT=	A shared drawing (whiteboard) tool using multicast
-
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
-USE_X_PREFIX=	yes
-
-# ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do.
-USE_GHOSTSCRIPT_RUN=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-STRIP=
-.endif
-
-pre-everything::
-.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
-	@${ECHO} ""
-	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
-	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
-	@${ECHO} ""
-.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 e6f3ab0b72c8..000000000000
--- a/net/wb/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (i386-wb-1.59.tar.Z) = 7601eb1192ee2774940d805500c0a9ce
-SIZE (i386-wb-1.59.tar.Z) = 2049555
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-lite/Makefile b/net/wireshark-lite/Makefile
deleted file mode 100644
index dbf8b12b8218..000000000000
--- a/net/wireshark-lite/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Ports collection makefile for:   ethereal-lite
-# Date created:        20 March 2004
-# Whom:                Bill Fumerola <billf@mu.org>
-#
-# $FreeBSD$
-#
-
-LITE=		yes
-PKGNAMESUFFIX=	-lite
-
-MASTERDIR=	${.CURDIR}/../ethereal
-COMMENT=        A powerful network analyzer/capture tool (lite package)
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
deleted file mode 100644
index 83609e848c95..000000000000
--- a/net/wireshark/Makefile
+++ /dev/null
@@ -1,103 +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.10.3
-CATEGORIES=	net ipv6
-MASTER_SITES=	ftp://ftp.ethereal.com/pub/ethereal/all-versions/ \
-		ftp://gd.tuwien.ac.at/infosys/security/ethereal/all-versions/ \
-		ftp://ftp.sunet.se/pub/network/monitoring/ethereal/all-versions/ \
-		ftp://ftp.mirrors.wiretapped.net/pub/security/packet-capture/ethereal/all-versions/ \
-		http://www.mirrors.wiretapped.net/pub/security/packet-capture/ethereal/all-versions/
-
-MAINTAINER=	billf@FreeBSD.org
-COMMENT?=	A powerful network analyzer/capture tool
-
-USE_BZIP2=	yes
-WANT_GNOME=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--program-transform-name=""
-
-.for x in editcap idl2eth mergecap text2pcap
-.if defined(LITE)
-PLIST_SUB+=		${x:U}="@comment $x not installed"
-CONFIGURE_ARGS+=	--enable-$x=no
-.else
-PLIST_SUB+=		${x:U}=bin/$x
-MAN1+=			$x.1
-.endif
-.endfor
-
-.if !defined(WITHOUT_X11)
-USE_X_PREFIX=	yes
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_X11)
-MAN1+=		ethereal.1
-PLIST_SUB+=	ETHEREAL=bin/ethereal
-.if defined(WITH_GTK2) || (${HAVE_GNOME:Mgtk20}!="")
-USE_GNOME=	gtk20
-CONFIGURE_ARGS+=	--enable-gtk2=yes
-.else
-USE_GNOME=	gtk12
-.endif
-.else
-PLIST_SUB+=	ETHEREAL="@comment ethereal not built"
-USE_GNOME=	glib12
-CONFIGURE_ARGS+=	--enable-ethereal=no \
-			--disable-gtktest \
-			--with-gtk-prefix=/nonexistant \
-			--enable-gtk2=no
-.endif
-
-USE_LIBTOOL_VER=13
-LIBTOOLFILES=	configure epan/configure wiretap/configure doc/configure \
-	      	plugins/gryphon/configure
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-.if ${OSVERSION} >= 400014 && !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--enable-ipv6=yes
-.else
-CONFIGURE_ARGS+=	--enable-ipv6=no
-.endif
-
-.if exists(/usr/include/openssl/crypto.h)
-CONFIGURE_ARGS+=	--with-ssl=/usr
-.endif
-
-# XXX - untested
-.if defined(WITH_THREADS)
-CONFIGURE_ARGS+=	--enable-threads
-.endif
-
-.if !defined(WITHOUT_PCRE) && !defined(LITE)
-LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-CONFIGURE_ARGS+=	--with-pcre=${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=	--with-pcre=no
-.endif
-
-.if !defined(WITHOUT_SNMP) && !defined(LITE)
-LIB_DEPENDS+=	netsnmp.6:${PORTSDIR}/net-mgmt/net-snmp
-CONFIGURE_ARGS+=	--with-net-snmp=${LOCALBASE}/bin/net-snmp-config
-.else
-CONFIGURE_ARGS+=	--enable-snmp=no --with-ucd-snmp=no --with-net-snmp=no
-.endif
-
-.if !defined(WITHOUT_ADNS) && !defined(LITE)
-LIB_DEPENDS+=	adns.1:${PORTSDIR}/dns/adns
-CONFIGURE_ARGS+=	--with-adns=${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=	--with-adns=no
-.endif
-
-MAN1+=	tethereal.1
-MAN4+=	ethereal-filter.4
-
-.include <bsd.port.post.mk>
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
deleted file mode 100644
index 137745bd7f2f..000000000000
--- a/net/wireshark/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (ethereal-0.10.3.tar.bz2) = 6902272eb5304f57db76bf91abe453d1
-SIZE (ethereal-0.10.3.tar.bz2) = 4840005
diff --git a/net/wireshark/pkg-descr b/net/wireshark/pkg-descr
deleted file mode 100644
index fd7658ffd4b6..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://www.ethereal.com/
-
-Bill Fumerola <billf@chc-chimes.com>
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
deleted file mode 100644
index aa0fbe98374c..000000000000
--- a/net/wireshark/pkg-plist
+++ /dev/null
@@ -1,70 +0,0 @@
-%%EDITCAP%%
-%%ETHEREAL%%
-%%IDL2ETH%%
-%%MERGECAP%%
-bin/tethereal
-%%TEXT2PCAP%%
-lib/ethereal/plugins/%%PORTVERSION%%/acn.la
-lib/ethereal/plugins/%%PORTVERSION%%/acn.so
-lib/ethereal/plugins/%%PORTVERSION%%/artnet.la
-lib/ethereal/plugins/%%PORTVERSION%%/artnet.so
-lib/ethereal/plugins/%%PORTVERSION%%/asn1.la
-lib/ethereal/plugins/%%PORTVERSION%%/asn1.so
-lib/ethereal/plugins/%%PORTVERSION%%/ciscosm.la
-lib/ethereal/plugins/%%PORTVERSION%%/ciscosm.so
-lib/ethereal/plugins/%%PORTVERSION%%/coseventcomm.la
-lib/ethereal/plugins/%%PORTVERSION%%/coseventcomm.so
-lib/ethereal/plugins/%%PORTVERSION%%/cosnaming.la
-lib/ethereal/plugins/%%PORTVERSION%%/cosnaming.so
-lib/ethereal/plugins/%%PORTVERSION%%/docsis.la
-lib/ethereal/plugins/%%PORTVERSION%%/docsis.so
-lib/ethereal/plugins/%%PORTVERSION%%/enttec.la
-lib/ethereal/plugins/%%PORTVERSION%%/enttec.so
-lib/ethereal/plugins/%%PORTVERSION%%/gryphon.la
-lib/ethereal/plugins/%%PORTVERSION%%/gryphon.so
-lib/ethereal/plugins/%%PORTVERSION%%/irda.la
-lib/ethereal/plugins/%%PORTVERSION%%/irda.so
-lib/ethereal/plugins/%%PORTVERSION%%/lwres.la
-lib/ethereal/plugins/%%PORTVERSION%%/lwres.so
-lib/ethereal/plugins/%%PORTVERSION%%/megaco.la
-lib/ethereal/plugins/%%PORTVERSION%%/megaco.so
-lib/ethereal/plugins/%%PORTVERSION%%/mgcp.la
-lib/ethereal/plugins/%%PORTVERSION%%/mgcp.so
-lib/ethereal/plugins/%%PORTVERSION%%/pcli.la
-lib/ethereal/plugins/%%PORTVERSION%%/pcli.so
-lib/ethereal/plugins/%%PORTVERSION%%/rdm.la
-lib/ethereal/plugins/%%PORTVERSION%%/rdm.so
-lib/ethereal/plugins/%%PORTVERSION%%/rlm.la
-lib/ethereal/plugins/%%PORTVERSION%%/rlm.so
-lib/ethereal/plugins/%%PORTVERSION%%/rtnet.la
-lib/ethereal/plugins/%%PORTVERSION%%/rtnet.so
-lib/ethereal/plugins/%%PORTVERSION%%/rudp.la
-lib/ethereal/plugins/%%PORTVERSION%%/rudp.so
-lib/ethereal/plugins/%%PORTVERSION%%/v5ua.la
-lib/ethereal/plugins/%%PORTVERSION%%/v5ua.so
-lib/libethereal.la
-lib/libethereal.so
-lib/libethereal.so.0
-lib/libwiretap.la
-lib/libwiretap.so
-lib/libwiretap.so.0
-share/ethereal/diameter/dictionary.dtd
-share/ethereal/diameter/dictionary.xml
-share/ethereal/diameter/mobileipv4.xml
-share/ethereal/diameter/nasreq.xml
-share/ethereal/diameter/sunping.xml
-share/ethereal/help/capture_filters.txt
-share/ethereal/help/capturing.txt
-share/ethereal/help/display_filters.txt
-share/ethereal/help/faq.txt
-share/ethereal/help/getting_started.txt
-share/ethereal/help/overview.txt
-share/ethereal/help/toc
-share/ethereal/help/well_known.txt
-share/ethereal/manuf
-@dirrm lib/ethereal/plugins/%%PORTVERSION%%
-@dirrm lib/ethereal/plugins
-@dirrm lib/ethereal
-@dirrm share/ethereal/diameter
-@dirrm share/ethereal/help
-@dirrm share/ethereal
diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
deleted file mode 100644
index eeebea92bfb1..000000000000
--- a/net/xmlrpc-c-devel/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# ex:ts=8
-# New ports collection makefile for:	xmlrpc-c
-# Date created:			Mar 8, 2001
-# Whom:				Ying-Chieh Liao <ijliao@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xmlrpc-c
-PORTVERSION=	0.9.10
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	XML-RPC library for C and C++
-
-LIB_DEPENDS=	wwwcore.1:${PORTSDIR}/www/libwww
-RUN_DEPENDS=	${SITE_PERL}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
-
-USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
-INSTALLS_SHLIB=	yes
-
-MAN1=	meerkat-app-list.1 xml-rpc-api2cpp.1 xmlrpc-c-config.1 \
-	query-meerkat.1 xml-rpc-api2txt.1
-MAN7=	xmlrpc-c.7
-
-.include <bsd.port.mk>
diff --git a/net/xmlrpc-c-devel/distinfo b/net/xmlrpc-c-devel/distinfo
deleted file mode 100644
index e38335487986..000000000000
--- a/net/xmlrpc-c-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (xmlrpc-c-0.9.10.tar.gz) = 847410fae881f0fb641a186db6c8c015
-SIZE (xmlrpc-c-0.9.10.tar.gz) = 436181
diff --git a/net/xmlrpc-c-devel/files/patch-examples::interop-client::InteropEchoProxy.cc b/net/xmlrpc-c-devel/files/patch-examples::interop-client::InteropEchoProxy.cc
deleted file mode 100644
index 241207275aa7..000000000000
--- a/net/xmlrpc-c-devel/files/patch-examples::interop-client::InteropEchoProxy.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- examples/interop-client/InteropEchoProxy.cc.orig	Wed Apr 25 00:17:25 2001
-+++ examples/interop-client/InteropEchoProxy.cc	Tue Mar  2 23:39:39 2004
-@@ -12,7 +12,7 @@
- public:
-     InteropEchoProxy (const XmlRpcClient& client)
-         : mClient(client) {}
--    InteropEchoProxy (const string& server_url)
-+    InteropEchoProxy (const std::string& server_url)
-         : mClient(XmlRpcClient(server_url)) {}
-     InteropEchoProxy (const InteropEchoProxy& o)
-         : mClient(o.mClient) {}
-@@ -23,7 +23,7 @@
-     }
- 
-     /* Echo an arbitrary XML-RPC string. */
--    string echoString (string string1);
-+    std::string echoString (std::string string1);
- 
-     /* Echo an arbitrary XML-RPC integer. */
-     XmlRpcValue::int32 echoInteger (XmlRpcValue::int32 int1);
-@@ -55,7 +55,7 @@
- #include <XmlRpcCpp.h>
- #include "InteropEchoProxy.h"
- 
--string InteropEchoProxy::echoString (string string1) {
-+std::string InteropEchoProxy::echoString (std::string string1) {
-     XmlRpcValue params = XmlRpcValue::makeArray();
-     params.arrayAppendItem(XmlRpcValue::makeString(string1));
-     XmlRpcValue result = this->mClient.call("interopEchoTests.echoString", params);
diff --git a/net/xmlrpc-c-devel/files/patch-examples::interop-client::InteropEchoProxy.h b/net/xmlrpc-c-devel/files/patch-examples::interop-client::InteropEchoProxy.h
deleted file mode 100644
index 96bb666fb511..000000000000
--- a/net/xmlrpc-c-devel/files/patch-examples::interop-client::InteropEchoProxy.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- examples/interop-client/InteropEchoProxy.h.orig	Wed Apr 25 00:17:42 2001
-+++ examples/interop-client/InteropEchoProxy.h	Tue Mar  2 23:39:39 2004
-@@ -12,7 +12,7 @@
- public:
-     InteropEchoProxy (const XmlRpcClient& client)
-         : mClient(client) {}
--    InteropEchoProxy (const string& server_url)
-+    InteropEchoProxy (const std::string& server_url)
-         : mClient(XmlRpcClient(server_url)) {}
-     InteropEchoProxy (const InteropEchoProxy& o)
-         : mClient(o.mClient) {}
-@@ -23,7 +23,7 @@
-     }
- 
-     /* Echo an arbitrary XML-RPC string. */
--    string echoString (string string1);
-+    std::string echoString (std::string string1);
- 
-     /* Echo an arbitrary XML-RPC integer. */
-     XmlRpcValue::int32 echoInteger (XmlRpcValue::int32 int1);
diff --git a/net/xmlrpc-c-devel/files/patch-examples::interop-client::interop-client.cc b/net/xmlrpc-c-devel/files/patch-examples::interop-client::interop-client.cc
deleted file mode 100644
index a8bde406790b..000000000000
--- a/net/xmlrpc-c-devel/files/patch-examples::interop-client::interop-client.cc
+++ /dev/null
@@ -1,108 +0,0 @@
---- examples/interop-client/interop-client.cc.orig	Thu Jun 28 11:54:08 2001
-+++ examples/interop-client/interop-client.cc	Tue Mar  2 23:39:39 2004
-@@ -1,8 +1,8 @@
- // Run various interop test cases against a list of servers.
- // This code is incomplete.
- 
--#include <iostream.h>
--#include <fstream.h>
-+#include <iostream>
-+#include <fstream>
- #include <stdexcept>
- 
- #include <XmlRpcCpp.h>
-@@ -17,13 +17,13 @@
- //=========================================================================
- 
- class TestResults {
--    string m_server_name;
--    string m_server_url;
-+    std::string m_server_name;
-+    std::string m_server_url;
-     XmlRpcValue m_toolkit_info;
-     XmlRpcValue m_test_results;
- 
- public:
--    TestResults(string server_name, string server_url);
-+    TestResults(std::string server_name, std::string server_url);
-     
- };
- 
-@@ -33,24 +33,24 @@
- //=========================================================================
- 
- static void
--run_interop_tests(const string& server_url_file,
--		  const string& output_html_file)
-+run_interop_tests(const std::string& server_url_file,
-+		  const std::string& output_html_file)
- {
--    ifstream urls(server_url_file.c_str());
--    ofstream out(output_html_file.c_str());
-+    std::ifstream urls(server_url_file.c_str());
-+    std::ofstream out(output_html_file.c_str());
- 
-     while (!urls.eof()) {
--	string url_info;
-+	std::string url_info;
- 	getline(urls, url_info);
- 	size_t comma = url_info.find(',');
--	if (comma == string::npos)
--	    throw domain_error("Lines of " + server_url_file +
-+	if (comma == std::string::npos)
-+	    throw std::domain_error("Lines of " + server_url_file +
- 			       " must be of the form \"name,url\"");
--	string server_name(url_info, 0, comma);
--	string server_url(url_info, comma + 1);
-+	std::string server_name(url_info, 0, comma);
-+	std::string server_url(url_info, comma + 1);
- 
--	cout << "Name: " << server_name << endl;
--	cout << "URL: " << server_url << endl << endl;
-+	std::cout << "Name: " << server_name << std::endl;
-+	std::cout << "URL: " << server_url << std::endl << std::endl;
-     }
- }
- 			      
-@@ -62,8 +62,8 @@
- // Print out a usage message.
- static void usage (void)
- {
--    cerr << "Usage: interop-client <server-url-file> <output-html-file>";
--    cerr << endl;
-+    std::cerr << "Usage: interop-client <server-url-file> <output-html-file>";
-+    std::cerr << std::endl;
-     exit(1);
- }
- 
-@@ -73,8 +73,8 @@
-     // Parse our command-line arguments.
-     if (argc != 3)
- 	usage();
--    string server_url_file(argv[1]);
--    string output_html_file(argv[2]);
-+    std::string server_url_file(argv[1]);
-+    std::string output_html_file(argv[2]);
- 
-     // Start up our client library.
-     XmlRpcClient::Initialize(NAME, VERSION);
-@@ -83,14 +83,14 @@
-     try {
- 	run_interop_tests(server_url_file, output_html_file);
-     } catch (XmlRpcFault& fault) {
--	cerr << argv[0] << ": XML-RPC fault #" << fault.getFaultCode()
--	     << ": " << fault.getFaultString() << endl;
-+	std::cerr << argv[0] << ": XML-RPC fault #" << fault.getFaultCode()
-+	     << ": " << fault.getFaultString() << std::endl;
- 	status = 1;
--    } catch (logic_error& err) {
--	cerr << argv[0] << ": " << err.what() << endl;
-+    } catch (std::logic_error& err) {
-+	std::cerr << argv[0] << ": " << err.what() << std::endl;
- 	status = 1;
-     } catch (...) {
--	cerr << argv[0] << ": Unknown exception" << endl;
-+	std::cerr << argv[0] << ": Unknown exception" << std::endl;
- 	status = 1;
-     }
- 
diff --git a/net/xmlrpc-c-devel/files/patch-examples::meerkat-app-list.cc b/net/xmlrpc-c-devel/files/patch-examples::meerkat-app-list.cc
deleted file mode 100644
index 6e6e770f69a4..000000000000
--- a/net/xmlrpc-c-devel/files/patch-examples::meerkat-app-list.cc
+++ /dev/null
@@ -1,88 +0,0 @@
---- examples/meerkat-app-list.cc.orig	Wed Apr 25 04:18:36 2001
-+++ examples/meerkat-app-list.cc	Tue Mar  2 23:39:39 2004
-@@ -2,8 +2,8 @@
- // For more details about O'Reilly's excellent Meerkat news service, see:
- // http://www.oreillynet.com/pub/a/rss/2000/11/14/meerkat_xmlrpc.html */
- 
--#include <iostream.h>
--#include <strstream.h>
-+#include <iostream>
-+#include <sstream>
- 
- #include <XmlRpcCpp.h>
- 
-@@ -15,12 +15,9 @@
- static void list_apps (int hours) {
- 
-     // Build our time_period parameter.
--    ostrstream time_period_stream;
--    time_period_stream << hours << "HOUR" << ends;
--    string time_period = time_period_stream.str();
--
--    // (Ask the ostrstream to reclaim ownership of its buffer.)
--    time_period_stream.freeze(false);
-+    std::ostringstream time_period_stream;
-+    time_period_stream << hours << "HOUR" << std::ends;
-+    std::string time_period = time_period_stream.str();
- 
-     // Assemble our meerkat query recipe.
-     XmlRpcValue recipe = XmlRpcValue::makeStruct();
-@@ -45,21 +42,21 @@
- 	XmlRpcValue app = apps.arrayGetItem(i);
- 
- 	// Get some information about our application.
--	string title       = app.structGetValue("title").getString();
--	string link        = app.structGetValue("link").getString();
--	string description = app.structGetValue("description").getString();
-+	std::string title       = app.structGetValue("title").getString();
-+	std::string link        = app.structGetValue("link").getString();
-+	std::string description = app.structGetValue("description").getString();
- 	
- 	// Print a separator line if necessary.
- 	if (first)
- 	    first = 0;
- 	else
--	    cout << endl;
-+	    std::cout << std::endl;
- 
- 	// Print this application entry.
- 	if (description.size() > 0) {
--	    cout << title << endl << description << endl << link << endl;
-+	    std::cout << title << std::endl << description << std::endl << link << std::endl;
- 	} else {
--	    cout << title << endl << description << endl << link << endl;
-+	    std::cout << title << std::endl << description << std::endl << link << std::endl;
- 	}
-     }
- }
-@@ -67,8 +64,8 @@
- // Print out a usage message.
- static void usage (void)
- {
--    cerr << "Usage: meekat-app-list [hours]" << endl;
--    cerr << "Data from <http://www.oreillynet.com/meerkat/>." << endl;
-+    std::cerr << "Usage: meekat-app-list [hours]" << std::endl;
-+    std::cerr << "Data from <http://www.oreillynet.com/meerkat/>." << std::endl;
-     exit(1);
- }
- 
-@@ -85,7 +82,7 @@
-     if (hours == 0)
- 	usage();
-     if (hours > 49) {
--        cerr << "It's not nice to ask for > 49 hours at once." << endl;
-+        std::cerr << "It's not nice to ask for > 49 hours at once." << std::endl;
-         exit(1);	
-     }
- 
-@@ -96,8 +93,8 @@
-     try {
- 	list_apps(hours);
-     } catch (XmlRpcFault& fault) {
--	cerr << argv[0] << ": XML-RPC fault #" << fault.getFaultCode()
--	     << ": " << fault.getFaultString() << endl;
-+	std::cerr << argv[0] << ": XML-RPC fault #" << fault.getFaultCode()
-+	     << ": " << fault.getFaultString() << std::endl;
- 	status = 1;
-     }
- 
diff --git a/net/xmlrpc-c-devel/files/patch-lib::abyss::src::data.c b/net/xmlrpc-c-devel/files/patch-lib::abyss::src::data.c
deleted file mode 100644
index 906e288fca76..000000000000
--- a/net/xmlrpc-c-devel/files/patch-lib::abyss::src::data.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/abyss/src/data.c.orig	Fri Feb  2 02:18:08 2001
-+++ lib/abyss/src/data.c	Fri Mar  5 02:05:24 2004
-@@ -32,7 +32,6 @@
- **
- *******************************************************************************/
- 
--#include <malloc.h>
- #include <string.h>
- #include "abyss.h"
- 
diff --git a/net/xmlrpc-c-devel/files/patch-src::XmlRpcCpp.cc b/net/xmlrpc-c-devel/files/patch-src::XmlRpcCpp.cc
deleted file mode 100644
index e5886b27a3ea..000000000000
--- a/net/xmlrpc-c-devel/files/patch-src::XmlRpcCpp.cc
+++ /dev/null
@@ -1,103 +0,0 @@
---- src/XmlRpcCpp.cc.orig	Sat Apr 14 03:43:55 2001
-+++ src/XmlRpcCpp.cc	Tue Mar  2 23:39:39 2004
-@@ -38,7 +38,7 @@
- 			 fault.mFault.fault_string);
- }
- 
--XmlRpcFault::XmlRpcFault (const int faultCode, const string faultString) {
-+XmlRpcFault::XmlRpcFault (const int faultCode, const std::string faultString) {
-     xmlrpc_env_init(&mFault);
-     xmlrpc_env_set_fault(&mFault, faultCode,
- 			 const_cast<char*>(faultString.c_str()));
-@@ -57,9 +57,9 @@
-     xmlrpc_env_clean(&mFault);
- }
- 
--string XmlRpcFault::getFaultString (void) const {
-+std::string XmlRpcFault::getFaultString (void) const {
-     XMLRPC_ASSERT(mFault.fault_occurred);
--    return string(mFault.fault_string);
-+    return std::string(mFault.fault_string);
- }
- 
- 
-@@ -117,7 +117,7 @@
-     return XmlRpcValue(value, CONSUME_REFERENCE);
- }
- 
--XmlRpcValue XmlRpcValue::makeDateTime (const string& dateTime) {
-+XmlRpcValue XmlRpcValue::makeDateTime (const std::string& dateTime) {
-     XmlRpcEnv env;
-     xmlrpc_value *value;
-     const char *data = dateTime.c_str(); // Make sure we're not using wchar_t.
-@@ -126,7 +126,7 @@
-     return XmlRpcValue(value, CONSUME_REFERENCE);    
- }
- 
--XmlRpcValue XmlRpcValue::makeString (const string& str) {
-+XmlRpcValue XmlRpcValue::makeString (const std::string& str) {
-     XmlRpcEnv env;
-     const char *data = str.data();      // Make sure we're not using wchar_t.
-     size_t size = str.size();
-@@ -196,21 +196,21 @@
-     return result;
- }
- 
--string XmlRpcValue::getRawDateTime (void) const {
-+std::string XmlRpcValue::getRawDateTime (void) const {
-     XmlRpcEnv env;
-     char *result;
-     xmlrpc_parse_value(env, mValue, "8", &result);
-     env.throwIfFaultOccurred();
--    return string(result);
-+    return std::string(result);
- }
- 
--string XmlRpcValue::getString (void) const {
-+std::string XmlRpcValue::getString (void) const {
-     XmlRpcEnv env;
-     char *result;
-     size_t result_len;
-     xmlrpc_parse_value(env, mValue, "s#", &result, &result_len);
-     env.throwIfFaultOccurred();
--    return string(result, result_len);
-+    return std::string(result, result_len);
-     
- }
- 
-@@ -265,7 +265,7 @@
-     return result;
- }
- 
--bool XmlRpcValue::structHasKey (const string& key) {
-+bool XmlRpcValue::structHasKey (const std::string& key) {
-     XmlRpcEnv env;
-     const char *keystr = key.data();
-     size_t keylen = key.size();
-@@ -275,7 +275,7 @@
-     return result;
- }
- 
--XmlRpcValue XmlRpcValue::structGetValue (const string& key) {
-+XmlRpcValue XmlRpcValue::structGetValue (const std::string& key) {
-     XmlRpcEnv env;
-     const char *keystr = key.data();
-     size_t keylen = key.size();
-@@ -286,7 +286,7 @@
-     return XmlRpcValue(result);
- }
- 
--void XmlRpcValue::structSetValue (const string& key, const XmlRpcValue& value)
-+void XmlRpcValue::structSetValue (const std::string& key, const XmlRpcValue& value)
- {
-     XmlRpcEnv env;
-     const char *keystr = key.data();
-@@ -297,7 +297,7 @@
- }
- 
- void XmlRpcValue::structGetKeyAndValue (const int index,
--					string& out_key,
-+					std::string& out_key,
- 					XmlRpcValue& out_value)
- {
-     XmlRpcEnv env;
diff --git a/net/xmlrpc-c-devel/files/patch-src::XmlRpcCpp.h b/net/xmlrpc-c-devel/files/patch-src::XmlRpcCpp.h
deleted file mode 100644
index 56393f19ca1f..000000000000
--- a/net/xmlrpc-c-devel/files/patch-src::XmlRpcCpp.h
+++ /dev/null
@@ -1,97 +0,0 @@
---- src/XmlRpcCpp.h.orig	Sat Apr 14 03:46:16 2001
-+++ src/XmlRpcCpp.h	Tue Mar  2 23:39:39 2004
-@@ -71,12 +71,12 @@
- 
- public:
-                  XmlRpcFault (const XmlRpcFault &fault);
--                 XmlRpcFault (const int faultCode, const string faultString);
-+                 XmlRpcFault (const int faultCode, const std::string faultString);
-                  XmlRpcFault (const xmlrpc_env *env);
-                 ~XmlRpcFault (void);
- 
-     int          getFaultCode (void) const;
--    string       getFaultString (void) const;
-+    std::string  getFaultString (void) const;
-     xmlrpc_env  *getFaultEnv (void);
- };
- 
-@@ -167,8 +167,8 @@
-     static XmlRpcValue makeInt      (const XmlRpcValue::int32 i);
-     static XmlRpcValue makeBool     (const bool b);
-     static XmlRpcValue makeDouble   (const double d);
--    static XmlRpcValue makeDateTime (const string& dateTime);
--    static XmlRpcValue makeString   (const string& str);
-+    static XmlRpcValue makeDateTime (const std::string& dateTime);
-+    static XmlRpcValue makeString   (const std::string& str);
-     static XmlRpcValue makeString   (const char *const str);
-     static XmlRpcValue makeString   (const char *const str, size_t len);
-     static XmlRpcValue makeArray    (void);
-@@ -185,8 +185,8 @@
-     XmlRpcValue::int32 getInt   (void) const;
-     bool         getBool        (void) const;
-     double       getDouble      (void) const;
--    string       getRawDateTime (void) const;
--    string       getString      (void) const;
-+    std::string  getRawDateTime (void) const;
-+    std::string  getString      (void) const;
-     XmlRpcValue  getArray       (void) const;
-     XmlRpcValue  getStruct      (void) const;
- 
-@@ -209,11 +209,11 @@
-     // Struct functions. These will throw an XmlRpcFault if the value
-     // isn't a struct.
-     size_t       structSize (void);
--    bool         structHasKey (const string& key);
--    XmlRpcValue  structGetValue (const string& key);
--    void         structSetValue (const string& key, const XmlRpcValue& value);
-+    bool         structHasKey (const std::string& key);
-+    XmlRpcValue  structGetValue (const std::string& key);
-+    void         structSetValue (const std::string& key, const XmlRpcValue& value);
-     void         structGetKeyAndValue (const int index,
--				       string& out_key,
-+				       std::string& out_key,
- 				       XmlRpcValue& out_value);
- };
- 
-@@ -265,19 +265,19 @@
- class XmlRpcClient {
- 
- private:
--    string mServerUrl;
-+    std::string mServerUrl;
- 
- public:
--    static void Initialize (string appname, string appversion);
-+    static void Initialize (std::string appname, std::string appversion);
-     static void Terminate (void);
- 
--    XmlRpcClient (const string& server_url) : mServerUrl(server_url) {}
-+    XmlRpcClient (const std::string& server_url) : mServerUrl(server_url) {}
-     ~XmlRpcClient (void) {}
- 
-     XmlRpcClient (const XmlRpcClient& client);
-     XmlRpcClient& operator= (const XmlRpcClient& client);
- 
--    XmlRpcValue call (string method_name, XmlRpcValue param_array);
-+    XmlRpcValue call (std::string method_name, XmlRpcValue param_array);
- };
- 
- 
-@@ -299,7 +299,7 @@
-     return *this;
- }
- 
--inline void XmlRpcClient::Initialize (string appname, string appversion) {
-+inline void XmlRpcClient::Initialize (std::string appname, std::string appversion) {
-     xmlrpc_client_init(XMLRPC_CLIENT_NO_FLAGS,
- 		       const_cast<char*>(appname.c_str()),
- 		       const_cast<char*>(appversion.c_str()));
-@@ -309,7 +309,7 @@
-     xmlrpc_client_cleanup();
- }
- 
--inline XmlRpcValue XmlRpcClient::call (string method_name,
-+inline XmlRpcValue XmlRpcClient::call (std::string method_name,
- 				       XmlRpcValue param_array)
- {
-     XmlRpcEnv env;
diff --git a/net/xmlrpc-c-devel/files/patch-src::cpptest.cc b/net/xmlrpc-c-devel/files/patch-src::cpptest.cc
deleted file mode 100644
index 67395f125644..000000000000
--- a/net/xmlrpc-c-devel/files/patch-src::cpptest.cc
+++ /dev/null
@@ -1,89 +0,0 @@
---- src/cpptest.cc.orig	Wed May  2 00:26:13 2001
-+++ src/cpptest.cc	Tue Mar  2 23:39:39 2004
-@@ -28,15 +28,15 @@
- void test_failure (char* file, int line, char* statement)
- {
-     total_failures++;
--    cout << endl
--	 << file << ":" << line << ": expected (" << statement << ")" << endl;
-+    std::cout << std::endl
-+	 << file << ":" << line << ": expected (" << statement << ")" << std::endl;
- }
- 
- #define TEST(statement) \
-     do { \
-         total_tests++; \
-         if ((statement)) { \
--            cout << "."; \
-+            std::cout << "."; \
- 	} else { \
-             test_failure(__FILE__, __LINE__, #statement); \
-         } \
-@@ -45,7 +45,7 @@
- #define TEST_PASSED() \
-     do { \
-         total_tests++; \
--        cout << "."; \
-+        std::cout << "."; \
-     } while (0)
- 
- #define TEST_FAILED(reason) \
-@@ -187,7 +187,7 @@
-     TEST(XmlRpcValue::makeString("foo").getString() == "foo");
-     TEST(XmlRpcValue::makeString("bar", 3).getString() == "bar");
-     TEST(XmlRpcValue::makeString("bar", 3).getString() == "bar");
--    TEST(XmlRpcValue::makeString("a\0b").getString() == string("a\0b"));
-+    TEST(XmlRpcValue::makeString("a\0b").getString() == std::string("a\0b"));
-     XmlRpcValue::makeArray().getArray();
-     XmlRpcValue::makeStruct().getStruct();
- 
-@@ -219,7 +219,7 @@
-     TEST(strct.structHasKey("bar"));
-     TEST(!strct.structHasKey("nosuch"));
-     for (size_t i = 0; i < strct.structSize(); i++) {
--	string key;
-+	std::string key;
- 	XmlRpcValue value;
- 	strct.structGetKeyAndValue(i, key, value);
- 	TEST(key + "val" == value.getString());
-@@ -248,30 +248,30 @@
- 	test_errors();
- 
-     } catch (XmlRpcFault& fault) {
--	cout << "Unexpected XML-RPC fault when running test suites." << endl
-+	std::cout << "Unexpected XML-RPC fault when running test suites." << std::endl
- 	     << "Fault #" << fault.getFaultCode()
--	     << ": " << fault.getFaultString() << endl
--	     << "FAILED" << endl;
-+	     << ": " << fault.getFaultString() << std::endl
-+	     << "FAILED" << std::endl;
- 	exit(1);
-     } catch (...) {
--	cout << "Unexpected exception when running test suites." << endl
--	     << "FAILED" << endl;
-+	std::cout << "Unexpected exception when running test suites." << std::endl
-+	     << "FAILED" << std::endl;
- 	exit(1);
-     }
- 
-     // Summarize our test run.
--    cout << endl << "Ran " << total_tests << " tests, "
-+    std::cout << std::endl << "Ran " << total_tests << " tests, "
- 	 << total_failures << " failed, "
--	 << setprecision(4)
-+	 << std::setprecision(4)
- 	 << (100.0 - (100.0 * total_failures) / total_tests)
--	 << "% passed" << endl;
-+	 << "% passed" << std::endl;
- 
-     // Print the final result.
-     if (total_failures == 0) {
--	cout << "OK" << endl;
-+	std::cout << "OK" << std::endl;
- 	return 0;
-     }
- 
--    cout << "FAILED" << endl;
-+    std::cout << "FAILED" << std::endl;
-     return 1;
- }
diff --git a/net/xmlrpc-c-devel/files/patch-src::validatee.c b/net/xmlrpc-c-devel/files/patch-src::validatee.c
deleted file mode 100644
index cd5ace445e2f..000000000000
--- a/net/xmlrpc-c-devel/files/patch-src::validatee.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/validatee.c.orig	Sat Apr 14 04:04:07 2001
-+++ src/validatee.c	Tue Mar  2 23:39:39 2004
-@@ -33,6 +33,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "xmlrpc.h"
- #include "xmlrpc_abyss.h"
diff --git a/net/xmlrpc-c-devel/files/patch-src::xmlrpc.h b/net/xmlrpc-c-devel/files/patch-src::xmlrpc.h
deleted file mode 100644
index d486bcb288f8..000000000000
--- a/net/xmlrpc-c-devel/files/patch-src::xmlrpc.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/xmlrpc.h.orig	Thu Jun 28 01:35:01 2001
-+++ src/xmlrpc.h	Tue Mar  2 23:39:39 2004
-@@ -152,7 +152,7 @@
- 
- /* The same as the above, but using a printf-style format string. */
- void xmlrpc_env_set_fault_formatted (xmlrpc_env* env, int code,
--				     char *format, ...);
-+				     const char *format, ...);
- 
- /* A simple debugging assertion. */
- #define XMLRPC_ASSERT_ENV_OK(env) \
-@@ -362,17 +362,23 @@
- ** Increments the reference counts of input arguments if necessary.
- ** See the xmlrpc-c documentation for more information. */
- extern xmlrpc_value *
--xmlrpc_build_value (xmlrpc_env* env, char* format, ...);
-+xmlrpc_build_value (xmlrpc_env* env, const char* format, ...);
- 
- /* The same as the above, but using a va_list. */
- extern xmlrpc_value *
--xmlrpc_build_value_va (xmlrpc_env* env, char* format, va_list args);
-+xmlrpc_build_value_va (xmlrpc_env* env, const char* format, va_list args);
- 
- /* Extract values from an xmlrpc_value and store them into C variables.
- ** Does not increment the reference counts of output values.
- ** See the xmlrpc-c documentation for more information. */
- extern void
--xmlrpc_parse_value (xmlrpc_env* env, xmlrpc_value* value, char* format, ...);
-+xmlrpc_parse_value (xmlrpc_env* env, xmlrpc_value* value,
-+                    const char* format, ...);
-+
-+/* The same as the above, but using a va_list. */
-+extern void
-+xmlrpc_parse_value_va (xmlrpc_env* env, xmlrpc_value* value,
-+                       const char* format, va_list args);
- 
- /* Return the number of elements in an XML-RPC array.
- ** Sets XMLRPC_TYPE_ERROR if 'array' is not an array. */
diff --git a/net/xmlrpc-c-devel/files/patch-src::xmlrpc_abyss.c b/net/xmlrpc-c-devel/files/patch-src::xmlrpc_abyss.c
deleted file mode 100644
index 23d48599af58..000000000000
--- a/net/xmlrpc-c-devel/files/patch-src::xmlrpc_abyss.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/xmlrpc_abyss.c.orig	Wed May  2 05:18:48 2001
-+++ src/xmlrpc_abyss.c	Tue Mar  2 23:39:39 2004
-@@ -34,6 +34,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "xmlrpc.h"
- 
diff --git a/net/xmlrpc-c-devel/files/patch-src::xmlrpc_data.c b/net/xmlrpc-c-devel/files/patch-src::xmlrpc_data.c
deleted file mode 100644
index 8491c186b043..000000000000
--- a/net/xmlrpc-c-devel/files/patch-src::xmlrpc_data.c
+++ /dev/null
@@ -1,117 +0,0 @@
---- src/xmlrpc_data.c.orig	Wed Apr 25 04:20:20 2001
-+++ src/xmlrpc_data.c	Tue Mar  2 23:39:39 2004
-@@ -182,10 +182,11 @@
- **  (in theory) also be portable.
- */
- 
--static xmlrpc_value* mkvalue(xmlrpc_env* env, char** format, va_list* args);
-+static xmlrpc_value* mkvalue(xmlrpc_env* env,
-+			     const char** format, va_list* args);
- 
- static xmlrpc_value* mkarray(xmlrpc_env* env,
--			     char** format,
-+			     const char** format,
- 			     char delimiter,
- 			     va_list* args)
- {
-@@ -236,7 +237,7 @@
- }
- 
- static xmlrpc_value* mkstruct(xmlrpc_env* env,
--			      char** format,
-+			      const char** format,
- 			      char delimiter,
- 			      va_list* args)
- {
-@@ -357,7 +358,8 @@
- }
- #endif /* HAVE_UNICODE_WCHAR */
- 
--static xmlrpc_value* mkvalue(xmlrpc_env* env, char** format, va_list* args)
-+static xmlrpc_value* mkvalue(xmlrpc_env* env,
-+			     const char** format, va_list* args)
- {
-     xmlrpc_value* val;
-     char *str, *contents;
-@@ -497,10 +499,10 @@
- }
- 
- xmlrpc_value* xmlrpc_build_value_va (xmlrpc_env* env,
--				     char* format,
-+				     const char* format,
- 				     va_list args)
- {
--    char *format_copy;
-+    const char *format_copy;
-     va_list args_copy;
-     xmlrpc_value* retval;
- 
-@@ -520,7 +522,7 @@
- }
- 
- xmlrpc_value* xmlrpc_build_value (xmlrpc_env* env,
--				  char* format, ...)
-+				  const char* format, ...)
- {
-     va_list args;
-     xmlrpc_value* retval;
-@@ -542,12 +544,12 @@
- 
- static void parsevalue (xmlrpc_env* env,
- 			xmlrpc_value* val,
--			char** format,
-+			const char** format,
- 			va_list* args);
- 
- static void parsearray (xmlrpc_env* env,
- 			xmlrpc_value* array,
--			char** format,
-+			const char** format,
- 			char delimiter,
- 			va_list* args)
- {
-@@ -584,7 +586,7 @@
- 
- static void parsestruct(xmlrpc_env* env,
- 			xmlrpc_value* strct,
--			char** format,
-+			const char** format,
- 			char delimiter,
- 			va_list* args)
- {
-@@ -633,7 +635,7 @@
- 
- static void parsevalue (xmlrpc_env* env,
- 			xmlrpc_value* val,
--			char** format,
-+			const char** format,
- 			va_list* args)
- {
-     xmlrpc_int32 *int32ptr;
-@@ -783,12 +785,12 @@
- 	return;
- }
- 
--static void xmlrpc_parse_value_va (xmlrpc_env* env,
--				   xmlrpc_value* value,
--				   char* format,
--				   va_list args)
-+void xmlrpc_parse_value_va (xmlrpc_env* env,
-+			    xmlrpc_value* value,
-+			    const char* format,
-+			    va_list args)
- {
--    char *format_copy;
-+    const char *format_copy;
-     va_list args_copy;
- 
-     XMLRPC_ASSERT_ENV_OK(env);
-@@ -808,7 +810,7 @@
- 
- void xmlrpc_parse_value (xmlrpc_env* env,
- 			 xmlrpc_value* value,
--			 char* format, ...)
-+			 const char* format, ...)
- {
-     va_list args;
- 
diff --git a/net/xmlrpc-c-devel/files/patch-src::xmlrpc_support.c b/net/xmlrpc-c-devel/files/patch-src::xmlrpc_support.c
deleted file mode 100644
index 0de4f49e28b9..000000000000
--- a/net/xmlrpc-c-devel/files/patch-src::xmlrpc_support.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xmlrpc_support.c.orig	Sat Apr 14 03:25:08 2001
-+++ src/xmlrpc_support.c	Tue Mar  2 23:39:39 2004
-@@ -99,7 +99,7 @@
- }
- 
- void xmlrpc_env_set_fault_formatted (xmlrpc_env* env, int code,
--				     char *format, ...)
-+				     const char *format, ...)
- {
-     va_list args;
-     char buffer[ERROR_BUFFER_SZ];
diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::DataType.cc b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::DataType.cc
deleted file mode 100644
index ce9bf0654d30..000000000000
--- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::DataType.cc
+++ /dev/null
@@ -1,187 +0,0 @@
---- tools/xml-rpc-api2cpp/DataType.cc.orig	Fri Mar 30 05:39:06 2001
-+++ tools/xml-rpc-api2cpp/DataType.cc	Tue Mar  2 23:39:39 2004
-@@ -1,5 +1,5 @@
--#include <iostream.h>
--#include <strstream.h>
-+#include <iostream>
-+#include <sstream>
- #include <stdexcept>
- 
- #include <XmlRpcCpp.h>
-@@ -12,12 +12,10 @@
- //  Instances of DataType know how generate code fragments for manipulating
- //  a specific XML-RPC data type.
- 
--string DataType::defaultParameterBaseName (int position) const {
--    ostrstream name_stream;
--    name_stream << typeName() << position << ends;
--    string name(name_stream.str());
--    // (Ask the ostrstream to reclaim ownership of its buffer.)
--    name_stream.freeze(false);
-+std::string DataType::defaultParameterBaseName (int position) const {
-+    std::ostringstream name_stream;
-+    name_stream << typeName() << position << std::ends;
-+    std::string name(name_stream.str());
-     return name;
- }
- 
-@@ -29,27 +27,27 @@
- 
- class RawDataType : public DataType {
- public:
--    RawDataType (const string& type_name) : DataType(type_name) {}
-+    RawDataType (const std::string& type_name) : DataType(type_name) {}
-     
--    virtual string parameterFragment (const string& base_name) const;
--    virtual string inputConversionFragment (const string& base_name) const;
--    virtual string returnTypeFragment () const;
--    virtual string outputConversionFragment (const string& var_name) const;
-+    virtual std::string parameterFragment (const std::string& base_name) const;
-+    virtual std::string inputConversionFragment (const std::string& base_name) const;
-+    virtual std::string returnTypeFragment () const;
-+    virtual std::string outputConversionFragment (const std::string& var_name) const;
- };
- 
--string RawDataType::parameterFragment (const string& base_name) const {
-+std::string RawDataType::parameterFragment (const std::string& base_name) const {
-     return "XmlRpcValue /*" + typeName() + "*/ " + base_name;
- }
- 
--string RawDataType::inputConversionFragment (const string& base_name) const {
-+std::string RawDataType::inputConversionFragment (const std::string& base_name) const {
-     return base_name;
- }
- 
--string RawDataType::returnTypeFragment () const {
-+std::string RawDataType::returnTypeFragment () const {
-     return "XmlRpcValue /*" + typeName() + "*/";
- }
- 
--string RawDataType::outputConversionFragment (const string& var_name) const {
-+std::string RawDataType::outputConversionFragment (const std::string& var_name) const {
-     return var_name;
- }
- 
-@@ -60,26 +58,26 @@
- //  Other types can be easily converted to and from a single native type.
- 
- class SimpleDataType : public DataType {
--    string mNativeType;
--    string mMakerFunc;
--    string mGetterFunc;
-+    std::string mNativeType;
-+    std::string mMakerFunc;
-+    std::string mGetterFunc;
- 
- public:
--    SimpleDataType (const string& type_name,
--		    const string& native_type,
--		    const string& maker_func,
--		    const string& getter_func);
--
--    virtual string parameterFragment (const string& base_name) const;
--    virtual string inputConversionFragment (const string& base_name) const;
--    virtual string returnTypeFragment () const;
--    virtual string outputConversionFragment (const string& var_name) const;
-+    SimpleDataType (const std::string& type_name,
-+		    const std::string& native_type,
-+		    const std::string& maker_func,
-+		    const std::string& getter_func);
-+
-+    virtual std::string parameterFragment (const std::string& base_name) const;
-+    virtual std::string inputConversionFragment (const std::string& base_name) const;
-+    virtual std::string returnTypeFragment () const;
-+    virtual std::string outputConversionFragment (const std::string& var_name) const;
- };
- 
--SimpleDataType::SimpleDataType (const string& type_name,
--				const string& native_type,
--				const string& maker_func,
--				const string& getter_func)
-+SimpleDataType::SimpleDataType (const std::string& type_name,
-+				const std::string& native_type,
-+				const std::string& maker_func,
-+				const std::string& getter_func)
-     : DataType(type_name),
-       mNativeType(native_type),
-       mMakerFunc(maker_func),
-@@ -87,20 +85,20 @@
- {
- }
- 
--string SimpleDataType::parameterFragment (const string& base_name) const {
-+std::string SimpleDataType::parameterFragment (const std::string& base_name) const {
-     return mNativeType + " " + base_name;
- }
- 
--string SimpleDataType::inputConversionFragment (const string& base_name) const
-+std::string SimpleDataType::inputConversionFragment (const std::string& base_name) const
- {
-     return mMakerFunc + "(" + base_name + ")";
- }
- 
--string SimpleDataType::returnTypeFragment () const {
-+std::string SimpleDataType::returnTypeFragment () const {
-     return mNativeType; 
- }
- 
--string SimpleDataType::outputConversionFragment (const string& var_name) const
-+std::string SimpleDataType::outputConversionFragment (const std::string& var_name) const
- {
-     return var_name + "." + mGetterFunc + "()";
- }
-@@ -116,26 +114,26 @@
- public:
-     VoidDataType () : DataType("void") {}
-     
--    virtual string parameterFragment (const string& base_name) const;
--    virtual string inputConversionFragment (const string& base_name) const;
--    virtual string returnTypeFragment () const;
--    virtual string outputConversionFragment (const string& var_name) const;
-+    virtual std::string parameterFragment (const std::string& base_name) const;
-+    virtual std::string inputConversionFragment (const std::string& base_name) const;
-+    virtual std::string returnTypeFragment () const;
-+    virtual std::string outputConversionFragment (const std::string& var_name) const;
- };
- 
--string VoidDataType::parameterFragment (const string& base_name) const {
--    throw domain_error("Can't handle functions with 'void' arguments'");
-+std::string VoidDataType::parameterFragment (const std::string& base_name) const {
-+    throw std::domain_error("Can't handle functions with 'void' arguments'");
-     
- }
- 
--string VoidDataType::inputConversionFragment (const string& base_name) const {
--    throw domain_error("Can't handle functions with 'void' arguments'");
-+std::string VoidDataType::inputConversionFragment (const std::string& base_name) const {
-+    throw std::domain_error("Can't handle functions with 'void' arguments'");
- }
- 
--string VoidDataType::returnTypeFragment () const {
-+std::string VoidDataType::returnTypeFragment () const {
-     return "void";
- }
- 
--string VoidDataType::outputConversionFragment (const string& var_name) const {
-+std::string VoidDataType::outputConversionFragment (const std::string& var_name) const {
-     return "/* Return value ignored. */";
- }
- 
-@@ -166,7 +164,7 @@
- 
- VoidDataType voidType;
- 
--const DataType& findDataType (const string& name) {
-+const DataType& findDataType (const std::string& name) {
-     if (name == "int" || name == "i4")
- 	return intType;
-     else if (name == "boolean")
-@@ -186,7 +184,7 @@
-     else if (name == "void")
- 	return voidType;
-     else
--	throw domain_error("Unknown XML-RPC type " + name);
-+	throw std::domain_error("Unknown XML-RPC type " + name);
-     
-     // This code should never be executed.
-     XMLRPC_ASSERT(0);
diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::DataType.h b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::DataType.h
deleted file mode 100644
index 1c8a9ad32bd1..000000000000
--- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::DataType.h
+++ /dev/null
@@ -1,40 +0,0 @@
---- tools/xml-rpc-api2cpp/DataType.h.orig	Mon Mar 26 03:34:53 2001
-+++ tools/xml-rpc-api2cpp/DataType.h	Tue Mar  2 23:39:39 2004
-@@ -1,28 +1,28 @@
- 
- class DataType {
--    string mTypeName;
-+    std::string mTypeName;
- 
-     DataType (const DataType&) { XMLRPC_ASSERT(0); }
-     DataType& operator= (const DataType&) { XMLRPC_ASSERT(0); return *this; }
- 
- public:
--    DataType (const string& type_name) : mTypeName(type_name) {}
-+    DataType (const std::string& type_name) : mTypeName(type_name) {}
-     virtual ~DataType () {}
- 
-     // Return the name for this XML-RPC type.
--    virtual string typeName () const { return mTypeName; }
-+    virtual std::string typeName () const { return mTypeName; }
- 
-     // Given a parameter position, calculate a unique base name for all
-     // parameter-related variables.
--    virtual string defaultParameterBaseName (int position) const;
-+    virtual std::string defaultParameterBaseName (int position) const;
- 
-     // Virtual functions for processing parameters.
--    virtual string parameterFragment (const string& base_name) const = 0;
--    virtual string inputConversionFragment (const string& base_name) const = 0;
-+    virtual std::string parameterFragment (const std::string& base_name) const = 0;
-+    virtual std::string inputConversionFragment (const std::string& base_name) const = 0;
- 
-     // Virtual functions for processing return values.
--    virtual string returnTypeFragment () const = 0;
--    virtual string outputConversionFragment (const string& var_name) const = 0;
-+    virtual std::string returnTypeFragment () const = 0;
-+    virtual std::string outputConversionFragment (const std::string& var_name) const = 0;
- };
- 
--const DataType& findDataType (const string& name);
-+const DataType& findDataType (const std::string& name);
diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::SystemProxy.cc b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::SystemProxy.cc
deleted file mode 100644
index 9032880678b4..000000000000
--- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::SystemProxy.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- tools/xml-rpc-api2cpp/SystemProxy.cc.orig	Mon Mar 26 08:46:28 2001
-+++ tools/xml-rpc-api2cpp/SystemProxy.cc	Tue Mar  2 23:39:39 2004
-@@ -10,14 +10,14 @@
-     return result;
- }
- 
--XmlRpcValue /*array*/ SystemProxy::methodSignature (string string1) {
-+XmlRpcValue /*array*/ SystemProxy::methodSignature (std::string string1) {
-     XmlRpcValue params = XmlRpcValue::makeArray();
-     params.arrayAppendItem(XmlRpcValue::makeString(string1));
-     XmlRpcValue result = this->mClient.call("system.methodSignature", params);
-     return result;
- }
- 
--string SystemProxy::methodHelp (string string1) {
-+std::string SystemProxy::methodHelp (std::string string1) {
-     XmlRpcValue params = XmlRpcValue::makeArray();
-     params.arrayAppendItem(XmlRpcValue::makeString(string1));
-     XmlRpcValue result = this->mClient.call("system.methodHelp", params);
diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::SystemProxy.h b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::SystemProxy.h
deleted file mode 100644
index ed3d4b6e4cc3..000000000000
--- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::SystemProxy.h
+++ /dev/null
@@ -1,28 +0,0 @@
---- tools/xml-rpc-api2cpp/SystemProxy.h.orig	Mon Mar 26 08:49:56 2001
-+++ tools/xml-rpc-api2cpp/SystemProxy.h	Tue Mar  2 23:39:39 2004
-@@ -12,7 +12,7 @@
- public:
-     SystemProxy (const XmlRpcClient& client)
-         : mClient(client) {}
--    SystemProxy (const string& server_url)
-+    SystemProxy (const std::string& server_url)
-         : mClient(XmlRpcClient(server_url)) {}
-     SystemProxy (const SystemProxy& o)
-         : mClient(o.mClient) {}
-@@ -29,13 +29,13 @@
-        signatures. Each signature is an array of strings. The first item of
-        each signature is the return type, and any others items are
-        parameter types. */
--    XmlRpcValue /*array*/ methodSignature (string string1);
-+    XmlRpcValue /*array*/ methodSignature (std::string string1);
- 
-     /* Given the name of a method, return a help string. */
--    string methodHelp (string string1);
-+    std::string methodHelp (std::string string1);
- 
-     /* Process an array of calls, and return an array of results. Calls
--       should be structs of the form {'methodName': string, 'params':
-+       should be structs of the form {'methodName': std::string, 'params':
-        array}. Each result will either be a single-item array containg the
-        result value, or a struct of the form {'faultCode': int,
-        'faultString': string}. This is useful when you need to make lots of
diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcClass.cc b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcClass.cc
deleted file mode 100644
index 794d218df932..000000000000
--- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcClass.cc
+++ /dev/null
@@ -1,81 +0,0 @@
---- tools/xml-rpc-api2cpp/XmlRpcClass.cc.orig	Mon Mar 26 08:49:19 2001
-+++ tools/xml-rpc-api2cpp/XmlRpcClass.cc	Tue Mar  2 23:39:39 2004
-@@ -1,6 +1,6 @@
--#include <iostream.h>
-+#include <iostream>
- #include <stdexcept>
--#include <vector.h>
-+#include <vector>
- 
- #include <XmlRpcCpp.h>
- #include "DataType.h"
-@@ -14,7 +14,7 @@
- //  This class stores information about a proxy class, and knows how to
- //  generate code.
- 
--XmlRpcClass::XmlRpcClass (string class_name)
-+XmlRpcClass::XmlRpcClass (std::string class_name)
-     : mClassName(class_name)
- {
- }
-@@ -39,37 +39,37 @@
-     mFunctions.push_back(function);
- }
- 
--void XmlRpcClass::printDeclaration (ostream& out)
-+void XmlRpcClass::printDeclaration (std::ostream& out)
- {
--    cout << "class " << mClassName << " {" << endl;
--    cout << "    XmlRpcClient mClient;" << endl;
--    cout << endl;
--    cout << "public:" << endl;
--    cout << "    " << mClassName << " (const XmlRpcClient& client)" << endl;
--    cout << "        : mClient(client) {}" << endl;
--    cout << "    " << mClassName << " (const string& server_url)" << endl;
--    cout << "        : mClient(XmlRpcClient(server_url)) {}" << endl;
--    cout << "    " << mClassName << " (const " << mClassName << "& o)" << endl;
--    cout << "        : mClient(o.mClient) {}" << endl;
--    cout << endl;
--    cout << "    " << mClassName << "& operator= (const "
--	 << mClassName << "& o) {" << endl;
--    cout << "        if (this != &o) mClient = o.mClient;" << endl;
--    cout << "        return *this;" << endl;
--    cout << "    }" << endl;
-+    std::cout << "class " << mClassName << " {" << std::endl;
-+    std::cout << "    XmlRpcClient mClient;" << std::endl;
-+    std::cout << std::endl;
-+    std::cout << "public:" << std::endl;
-+    std::cout << "    " << mClassName << " (const XmlRpcClient& client)" << std::endl;
-+    std::cout << "        : mClient(client) {}" << std::endl;
-+    std::cout << "    " << mClassName << " (const std::string& server_url)" << std::endl;
-+    std::cout << "        : mClient(XmlRpcClient(server_url)) {}" << std::endl;
-+    std::cout << "    " << mClassName << " (const " << mClassName << "& o)" << std::endl;
-+    std::cout << "        : mClient(o.mClient) {}" << std::endl;
-+    std::cout << std::endl;
-+    std::cout << "    " << mClassName << "& operator= (const "
-+	 << mClassName << "& o) {" << std::endl;
-+    std::cout << "        if (this != &o) mClient = o.mClient;" << std::endl;
-+    std::cout << "        return *this;" << std::endl;
-+    std::cout << "    }" << std::endl;
- 
--    vector<XmlRpcFunction>::iterator f;
-+    std::vector<XmlRpcFunction>::iterator f;
-     for (f = mFunctions.begin(); f < mFunctions.end(); ++f) {
--	f->printDeclarations(cout);
-+	f->printDeclarations(std::cout);
-     }
- 
--    cout << "};" << endl;    
-+    std::cout << "};" << std::endl;    
- }
- 
--void XmlRpcClass::printDefinition (ostream& out)
-+void XmlRpcClass::printDefinition (std::ostream& out)
- {
--    vector<XmlRpcFunction>::iterator f;
-+    std::vector<XmlRpcFunction>::iterator f;
-     for (f = mFunctions.begin(); f < mFunctions.end(); ++f) {
--	f->printDefinitions(cout, mClassName);
-+	f->printDefinitions(std::cout, mClassName);
-     }
- }
diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcClass.h b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcClass.h
deleted file mode 100644
index 3c9ed6b4c7cf..000000000000
--- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcClass.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- tools/xml-rpc-api2cpp/XmlRpcClass.h.orig	Mon Mar 26 08:43:07 2001
-+++ tools/xml-rpc-api2cpp/XmlRpcClass.h	Tue Mar  2 23:39:39 2004
-@@ -1,19 +1,19 @@
--#include <vector.h>
-+#include <vector>
- 
- class XmlRpcClass {
--    string mClassName;
--    vector<XmlRpcFunction> mFunctions;
-+    std::string mClassName;
-+    std::vector<XmlRpcFunction> mFunctions;
- 
- 
- public:
--    XmlRpcClass (string class_name);
-+    XmlRpcClass (std::string class_name);
-     XmlRpcClass (const XmlRpcClass&);
-     XmlRpcClass& operator= (const XmlRpcClass&);
- 
--    string className () const { return mClassName; }
-+    std::string className () const { return mClassName; }
- 
-     void addFunction (const XmlRpcFunction& function);
- 
--    void printDeclaration (ostream& out);
--    void printDefinition (ostream& out);
-+    void printDeclaration (std::ostream& out);
-+    void printDefinition (std::ostream& out);
- };
diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcFucntion.cc b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcFucntion.cc
deleted file mode 100644
index 1fe27ce99876..000000000000
--- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcFucntion.cc
+++ /dev/null
@@ -1,123 +0,0 @@
---- tools/xml-rpc-api2cpp/XmlRpcFunction.cc.orig	Mon Mar 26 08:21:07 2001
-+++ tools/xml-rpc-api2cpp/XmlRpcFunction.cc	Tue Mar  2 23:39:39 2004
-@@ -1,4 +1,4 @@
--#include <iostream.h>
-+#include <iostream>
- #include <stdexcept>
- 
- #include <XmlRpcCpp.h>
-@@ -12,9 +12,9 @@
- //  Contains everything we know about a given server function, and knows
- //  how to print local bindings.
- 
--XmlRpcFunction::XmlRpcFunction(const string& function_name,
--			       const string& method_name,
--			       const string& help,
-+XmlRpcFunction::XmlRpcFunction(const std::string& function_name,
-+			       const std::string& method_name,
-+			       const std::string& help,
- 			       XmlRpcValue synopsis)
-     : mFunctionName(function_name), mMethodName(method_name),
-       mHelp(help), mSynopsis(synopsis)
-@@ -37,10 +37,10 @@
-     return *this;
- }
- 
--void XmlRpcFunction::printDeclarations (ostream& out) {
-+void XmlRpcFunction::printDeclarations (std::ostream& out) {
- 
-     // XXX - Do a sloppy job of printing documentation.
--    out << endl << "    /* " << mHelp << " */" << endl;
-+    out << std::endl << "    /* " << mHelp << " */" << std::endl;
- 
-     // Print each declaration.
-     size_t end = mSynopsis.arraySize();
-@@ -48,16 +48,16 @@
- 	printDeclaration(out, i);
- }
- 
--void XmlRpcFunction::printDefinitions (ostream& out, const string& className) {
-+void XmlRpcFunction::printDefinitions (std::ostream& out, const std::string& className) {
-     size_t end = mSynopsis.arraySize();
-     for (size_t i = 0; i < end; i++) {
--	out << endl;
-+	out << std::endl;
- 	printDefinition(out, className, i);
-     }
- }
- 
- // Print the parameter declarations.
--void XmlRpcFunction::printParameters (ostream& out, size_t synopsis_index) {
-+void XmlRpcFunction::printParameters (std::ostream& out, size_t synopsis_index) {
-     size_t end = parameterCount(synopsis_index);
-     bool first = true;
-     for (size_t i = 0; i < end; i++) {
-@@ -67,47 +67,47 @@
- 	    out << ", ";
- 
- 	const DataType& ptype (parameterType(synopsis_index, i));
--	string basename = ptype.defaultParameterBaseName(i + 1);
-+	std::string basename = ptype.defaultParameterBaseName(i + 1);
- 	out << ptype.parameterFragment(basename);
-     }
- }
- 
--void XmlRpcFunction::printDeclaration (ostream& out, size_t synopsis_index) {
-+void XmlRpcFunction::printDeclaration (std::ostream& out, size_t synopsis_index) {
-     const DataType& rtype (returnType(synopsis_index));
-     out << "    " << rtype.returnTypeFragment() << " "
- 	<< mFunctionName << " (";
-     printParameters(out, synopsis_index);
--    out << ");" << endl;
-+    out << ");" << std::endl;
- }
- 
--void XmlRpcFunction::printDefinition (ostream& out,
--				      const string& className,
-+void XmlRpcFunction::printDefinition (std::ostream& out,
-+				      const std::string& className,
- 				      size_t synopsis_index)
- {
-     const DataType& rtype (returnType(synopsis_index));
-     out << rtype.returnTypeFragment() << " "
- 	<< className << "::" << mFunctionName << " (";
-     printParameters(out, synopsis_index);
--    out << ") {" << endl;    
--    out << "    XmlRpcValue params = XmlRpcValue::makeArray();" << endl;
-+    out << ") {" << std::endl;    
-+    out << "    XmlRpcValue params = XmlRpcValue::makeArray();" << std::endl;
- 
-     /* Emit code to convert the parameters into an array of XML-RPC objects. */
-     size_t end = parameterCount(synopsis_index);
-     for (size_t i = 0; i < end; i++) {
- 	const DataType& ptype (parameterType(synopsis_index, i));
--	string basename = ptype.defaultParameterBaseName(i + 1);
-+	std::string basename = ptype.defaultParameterBaseName(i + 1);
- 	out << "    params.arrayAppendItem("
--	    << ptype.inputConversionFragment(basename) << ");" << endl;
-+	    << ptype.inputConversionFragment(basename) << ");" << std::endl;
-     }
- 
-     /* Emit the function call.*/
-     out << "    XmlRpcValue result = this->mClient.call(\""
--	<< mMethodName << "\", params);" << endl;    
-+	<< mMethodName << "\", params);" << std::endl;    
- 
-     /* Emit the return statement. */
-     out << "    return " << rtype.outputConversionFragment("result")
--	<< ";" << endl;
--    out << "}" << endl;
-+	<< ";" << std::endl;
-+    out << "}" << std::endl;
- }
- 
- const DataType& XmlRpcFunction::returnType (size_t synopsis_index) {
-@@ -119,7 +119,7 @@
-     XmlRpcValue func_synop = mSynopsis.arrayGetItem(synopsis_index);
-     size_t size = func_synop.arraySize();
-     if (size < 1)
--	throw domain_error("Synopsis contained no items");
-+	throw std::domain_error("Synopsis contained no items");
-     return size - 1;
- }
- 
diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcFucntion.h b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcFucntion.h
deleted file mode 100644
index c366bac5cd54..000000000000
--- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcFucntion.h
+++ /dev/null
@@ -1,42 +0,0 @@
---- tools/xml-rpc-api2cpp/XmlRpcFunction.h.orig	Mon Mar 26 05:17:50 2001
-+++ tools/xml-rpc-api2cpp/XmlRpcFunction.h	Tue Mar  2 23:39:39 2004
-@@ -1,27 +1,27 @@
- 
- class XmlRpcFunction {
--    string mFunctionName;
--    string mMethodName;
--    string mHelp;
-+    std::string mFunctionName;
-+    std::string mMethodName;
-+    std::string mHelp;
-     XmlRpcValue mSynopsis;
- 
- public: 
--    XmlRpcFunction(const string& function_name,
--		   const string& method_name,
--		   const string& help,
-+    XmlRpcFunction(const std::string& function_name,
-+		   const std::string& method_name,
-+		   const std::string& help,
- 		   XmlRpcValue synopsis);
- 
-     XmlRpcFunction (const XmlRpcFunction&);
-     XmlRpcFunction& operator= (const XmlRpcFunction&);
-     
--    void printDeclarations (ostream& out);
--    void printDefinitions  (ostream& out, const string& className);
-+    void printDeclarations (std::ostream& out);
-+    void printDefinitions  (std::ostream& out, const std::string& className);
- 
- private:
--    void printParameters  (ostream& out, size_t synopsis_index);
--    void printDeclaration (ostream& out, size_t synopsis_index);
--    void printDefinition  (ostream& out,
--			   const string& className,
-+    void printParameters  (std::ostream& out, size_t synopsis_index);
-+    void printDeclaration (std::ostream& out, size_t synopsis_index);
-+    void printDefinition  (std::ostream& out,
-+			   const std::string& className,
- 			   size_t synopsis_index);
- 
-     const DataType& returnType (size_t synopsis_index);
diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::xml-rpc-api2cpp b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::xml-rpc-api2cpp
deleted file mode 100644
index 95b9194227a6..000000000000
--- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::xml-rpc-api2cpp
+++ /dev/null
@@ -1,170 +0,0 @@
---- tools/xml-rpc-api2cpp/xml-rpc-api2cpp.cc.orig	Thu Apr 12 08:21:38 2001
-+++ tools/xml-rpc-api2cpp/xml-rpc-api2cpp.cc	Tue Mar  2 23:39:39 2004
-@@ -1,4 +1,4 @@
--#include <iostream.h>
-+#include <iostream>
- #include <stdexcept>
- 
- #include <XmlRpcCpp.h>
-@@ -17,9 +17,9 @@
- //  Connect to a remote server and extract the information we'll need to
- //  build a proxy class.
- 
--XmlRpcClass get_class_info (string server_url,
--			    string class_prefix,
--			    string class_name)
-+XmlRpcClass get_class_info (std::string server_url,
-+			    std::string class_prefix,
-+			    std::string class_name)
- {
-     // Create a place to store our data.
-     XmlRpcClass info(class_name);
-@@ -33,22 +33,22 @@
-     for (size_t i = 0; i < end; i++) {
- 
- 	// Break the method name into two pieces.
--	string method_prefix;
--	string function_name;
--	string method_name = methods.arrayGetItem(i).getString();
-+	std::string method_prefix;
-+	std::string function_name;
-+	std::string method_name = methods.arrayGetItem(i).getString();
- 	size_t last_dot = method_name.rfind('.');
--	if (last_dot == string::npos) {
-+	if (last_dot == std::string::npos) {
- 	    function_name = method_name;
- 	} else {
--	    method_prefix = string(method_name, 0, last_dot);
--	    function_name = string(method_name, last_dot + 1);
-+	    method_prefix = std::string(method_name, 0, last_dot);
-+	    function_name = std::string(method_name, last_dot + 1);
- 	}
- 
- 	// Decide whether we care about this function.
- 	if (method_prefix == class_prefix) {
- 
- 	    // Fetch some information about the function.
--	    string help = system.methodHelp(method_name);
-+	    std::string help = system.methodHelp(method_name);
- 	    XmlRpcValue signature = system.methodSignature(method_name);
- 
- 	    // Add this function to our class information.
-@@ -66,23 +66,23 @@
- //=========================================================================
- //  Print a complete header for the specified class.
- 
--void print_header (ostream& out, XmlRpcClass& class_info) {
--    string class_name = class_info.className();
--    out << "// " << class_name << ".h - xmlrpc-c C++ proxy class" << endl;
--    out << "// Auto-generated by xml-rpc-api2cpp." << endl;
--    out << endl;
--
--    string header_symbol = "_" + class_name + "_H_";
--    out << "#ifndef " << header_symbol << endl;
--    out << "#define " << header_symbol << " 1" << endl;
--    out << endl;
--    out << "#include <XmlRpcCpp.h>" << endl;
--    out << endl;
-+void print_header (std::ostream& out, XmlRpcClass& class_info) {
-+    std::string class_name = class_info.className();
-+    out << "// " << class_name << ".h - xmlrpc-c C++ proxy class" << std::endl;
-+    out << "// Auto-generated by xml-rpc-api2cpp." << std::endl;
-+    out << std::endl;
-+
-+    std::string header_symbol = "_" + class_name + "_H_";
-+    out << "#ifndef " << header_symbol << std::endl;
-+    out << "#define " << header_symbol << " 1" << std::endl;
-+    out << std::endl;
-+    out << "#include <XmlRpcCpp.h>" << std::endl;
-+    out << std::endl;
- 
--    class_info.printDeclaration(cout);
-+    class_info.printDeclaration(std::cout);
- 
--    out << endl;
--    out << "#endif /* " << header_symbol << " */" << endl;
-+    out << std::endl;
-+    out << "#endif /* " << header_symbol << " */" << std::endl;
- }
- 
- 
-@@ -91,16 +91,16 @@
- //=========================================================================
- //  Print a complete header for the specified class.
- 
--void print_cc_file (ostream& out, XmlRpcClass& class_info) {
--    string class_name = class_info.className();
--    out << "// " << class_name << ".cc - xmlrpc-c C++ proxy class" << endl;
--    out << "// Auto-generated by xml-rpc-api2cpp." << endl;
--    out << endl;
-+void print_cc_file (std::ostream& out, XmlRpcClass& class_info) {
-+    std::string class_name = class_info.className();
-+    out << "// " << class_name << ".cc - xmlrpc-c C++ proxy class" << std::endl;
-+    out << "// Auto-generated by xml-rpc-api2cpp." << std::endl;
-+    out << std::endl;
- 
--    out << "#include <XmlRpcCpp.h>" << endl;
--    out << "#include \"" << class_name << ".h\"" << endl;
-+    out << "#include <XmlRpcCpp.h>" << std::endl;
-+    out << "#include \"" << class_name << ".h\"" << std::endl;
- 
--    class_info.printDefinition(cout);
-+    class_info.printDefinition(std::cout);
- }
- 
- 
-@@ -113,18 +113,18 @@
- 
-     /* Parse our command-line arguments. */
-     if (argc != 4) {
--	cerr << argv[0] << ": Usage:" << endl
-+	std::cerr << argv[0] << ": Usage:" << std::endl
- 	     << "  xml-rpc-api2cpp <server_url> <method_prefix> <local_class>"
--	     << endl << endl
--	     << "Sample arguments:" << endl
--	     << "  server_url = http://localhost/RPC2" << endl
--	     << "  method_prefix = system" << endl
--	     << "  local_class = SystemProxy" << endl;
-+	     << std::endl << std::endl
-+	     << "Sample arguments:" << std::endl
-+	     << "  server_url = http://localhost/RPC2" << std::endl
-+	     << "  method_prefix = system" << std::endl
-+	     << "  local_class = SystemProxy" << std::endl;
- 	exit(1);
-     }
--    string server_url = argv[1];
--    string method_prefix = argv[2];
--    string local_class = argv[3];
-+    std::string server_url = argv[1];
-+    std::string method_prefix = argv[2];
-+    std::string local_class = argv[3];
- 
-     int status = 0;
-     XmlRpcClient::Initialize(NAME, VERSION);
-@@ -133,18 +133,18 @@
- 	XmlRpcClass system = get_class_info(server_url,
- 					    method_prefix,
- 					    local_class);
--	print_header(cout, system);
--	cout << endl;
--	print_cc_file(cout, system);
-+	print_header(std::cout, system);
-+	std::cout << std::endl;
-+	print_cc_file(std::cout, system);
-     } catch (XmlRpcFault& fault) {
--	cerr << argv[0] << ": XML-RPC fault #" << fault.getFaultCode()
--	     << ": " << fault.getFaultString() << endl;
-+	std::cerr << argv[0] << ": XML-RPC fault #" << fault.getFaultCode()
-+	     << ": " << fault.getFaultString() << std::endl;
- 	status = 1;
--    } catch (logic_error& err) {
--	cerr << argv[0] << ": " << err.what() << endl;
-+    } catch (std::logic_error& err) {
-+	std::cerr << argv[0] << ": " << err.what() << std::endl;
- 	status = 1;
-     } catch (...) {
--	cerr << argv[0] << ": Unknown exception" << endl;
-+	std::cerr << argv[0] << ": Unknown exception" << std::endl;
- 	status = 1;
-     }
- 
diff --git a/net/xmlrpc-c-devel/pkg-descr b/net/xmlrpc-c-devel/pkg-descr
deleted file mode 100644
index 41931be8cb1d..000000000000
--- a/net/xmlrpc-c-devel/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-XML-RPC is a quick-and-easy way to make procedure calls over the Internet.
-It converts the procedure call into XML document, sends it to a remote
-server using HTTP, and gets back the response as XML.
-
-This library provides a modular implementation of XML-RPC for C and C++.
-
-   - C API and experimental C++ API.
-   - Modular XML-RPC core: If you want, you can supply all your own HTTP
-     code.
-   - Synchronous and asynchronous XML-RPC clients based on w3c-libwww.
-   - Multithreaded XML-RPC server based on the Abyss web server.
-   - Full support for basic types, including <struct>, <array> and <base64>.
-   - Extensive test suites to help verify correct behavior and correct
-     error handling.
-   - Passes the official XML-RPC validator1 test suite.
-
-WWW: http://xmlrpc-c.sourceforge.net/
diff --git a/net/xmlrpc-c-devel/pkg-plist b/net/xmlrpc-c-devel/pkg-plist
deleted file mode 100644
index 5d41e79f58a7..000000000000
--- a/net/xmlrpc-c-devel/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-bin/meerkat-app-list
-bin/query-meerkat
-bin/xml-rpc-api2cpp
-bin/xml-rpc-api2txt
-bin/xmlrpc-c-config
-include/XmlRpcCpp.h
-include/xmlrpc.h
-include/xmlrpc_abyss.h
-include/xmlrpc_cgi.h
-include/xmlrpc_client.h
-lib/libxmlrpc.a
-lib/libxmlrpc.so
-lib/libxmlrpc.so.7
-lib/libxmlrpc_abyss.a
-lib/libxmlrpc_abyss.so
-lib/libxmlrpc_abyss.so.7
-lib/libxmlrpc_abyss_server.a
-lib/libxmlrpc_abyss_server.so
-lib/libxmlrpc_abyss_server.so.7
-lib/libxmlrpc_cgi.a
-lib/libxmlrpc_cgi.so
-lib/libxmlrpc_cgi.so.7
-lib/libxmlrpc_client.a
-lib/libxmlrpc_client.so
-lib/libxmlrpc_client.so.7
-lib/libxmlrpc_cpp.a
-lib/libxmlrpc_xmlparse.a
-lib/libxmlrpc_xmlparse.so
-lib/libxmlrpc_xmlparse.so.7
-lib/libxmlrpc_xmltok.a
-lib/libxmlrpc_xmltok.so
-lib/libxmlrpc_xmltok.so.7