509 files changed, 65 insertions, 21271 deletions

diff --git a/MOVED b/MOVED
index 8f67823f400c..08fb81bbcf0b 100644
--- a/MOVED
+++ b/MOVED
@@ -6773,3 +6773,68 @@ net-mgmt/zenpack-grap||2014-09-01|Not staged
 net-mgmt/zenpack-interfacegraphs||2014-09-01|Not staged
 net-mgmt/zenpack-libvirt||2014-09-01|Not staged
 net-mgmt/zenpack-macreport||2014-09-01|Not staged
+net-p2p/azureus2||2014-09-01|Not staged
+net-p2p/linux-jigdo||2014-09-01|Not staged
+net-p2p/mldonkey-perlreactor||2014-09-01|Not staged
+net-p2p/mldonkey-urlslave||2014-09-01|Not staged
+net-p2p/museekplus||2014-09-01|Not staged
+net-p2p/opennap||2014-09-01|Not staged
+net-p2p/solidcoin||2014-09-01|Not staged
+net-p2p/teknap||2014-09-01|Not staged
+net-p2p/vhcp||2014-09-01|Not staged
+net/DarwinStreamingServer||2014-09-01|Not staged
+net/acx100||2014-09-01|Not staged
+net/balance||2014-09-01|Not staged
+net/bcusdk-eibd||2014-09-01|Not staged
+net/blam||2014-09-01|Not staged
+net/bld||2014-09-01|Not staged
+net/click||2014-09-01|Not staged
+net/cnet||2014-09-01|Not staged
+net/cnupm||2014-09-01|Not staged
+net/ct||2014-09-01|Not staged
+net/entitymib||2014-09-01|Not staged
+net/freedbd||2014-09-01|Not staged
+net/frickin||2014-09-01|Not staged
+net/fspd||2014-09-01|Not staged
+net/hawknl-devel||2014-09-01|Not staged
+net/hawknl||2014-09-01|Not staged
+net/heybuddy||2014-09-01|Not staged
+net/ipa_ipfw||2014-09-01|Not staged
+net/irrd||2014-09-01|Not staged
+net/iscsi-target||2014-09-01|Not staged
+net/kojoney||2014-09-01|Not staged
+net/libtcp4u||2014-09-01|Not staged
+net/mediaproxy||2014-09-01|Not staged
+net/mknbi||2014-09-01|Not staged
+net/mmucl||2014-09-01|Not staged
+net/ncplib||2014-09-01|Not staged
+net/ng_daphne||2014-09-01|Not staged
+net/ng_mikrotik_eoip||2014-09-01|Not staged
+net/openam||2014-09-01|Not staged
+net/openmcu||2014-09-01|Not staged
+net/openser||2014-09-01|Not staged
+net/pfflowd||2014-09-01|Not staged
+net/quagga-re||2014-09-01|Not staged
+net/rexx-sock||2014-09-01|Not staged
+net/ris||2014-09-01|Not staged
+net/rshell||2014-09-01|Not staged
+net/samba4wins||2014-09-01|Not staged
+net/ser||2014-09-01|Not staged
+net/silc-client||2014-09-01|Not staged
+net/silc-irssi-plugin||2014-09-01|Not staged
+net/silc-server||2014-09-01|Not staged
+net/skyfish||2014-09-01|Not staged
+net/skystar2||2014-09-01|Not staged
+net/tac_plus-libradius||2014-09-01|Not staged
+net/tcptraceroute-devel||2014-09-01|Not staged
+net/ushare||2014-09-01|Not staged
+net/v6eval||2014-09-01|Not staged
+net/vchat||2014-09-01|Not staged
+net/vserver||2014-09-01|Not staged
+net/wire||2014-09-01|Not staged
+net/wired-tracker||2014-09-01|Not staged
+net/wired||2014-09-01|Not staged
+net/xbone||2014-09-01|Not staged
+net/xipdump||2014-09-01|Not staged
+net/xorp-devel||2014-09-01|Not staged
+news/diablo||2014-09-01|Not staged
diff --git a/net-p2p/Makefile b/net-p2p/Makefile
index b825a4e7e306..10e54af2bd1f 100644
--- a/net-p2p/Makefile
+++ b/net-p2p/Makefile
@@ -5,7 +5,6 @@
 
     SUBDIR += amule
     SUBDIR += amule-devel
-    SUBDIR += azureus2
     SUBDIR += bitcoin
     SUBDIR += bitcoin-daemon
     SUBDIR += bitflu
@@ -48,7 +47,6 @@
     SUBDIR += libtorrent
     SUBDIR += libtorrent-rasterbar
     SUBDIR += libtorrent-rasterbar-python
-    SUBDIR += linux-jigdo
     SUBDIR += linuxdcpp
     SUBDIR += litecoin
     SUBDIR += litecoin-daemon
@@ -59,14 +57,10 @@
     SUBDIR += mldonkey
     SUBDIR += mldonkey-core
     SUBDIR += mldonkey-gui
-    SUBDIR += mldonkey-perlreactor
-    SUBDIR += mldonkey-urlslave
-    SUBDIR += museekplus
     SUBDIR += namecoin
     SUBDIR += napshare
     SUBDIR += ncdc
     SUBDIR += opendchub
-    SUBDIR += opennap
     SUBDIR += p5-Net-BitTorrent
     SUBDIR += p5-Net-BitTorrent-File
     SUBDIR += p5-Net-BitTorrent-PeerPacket
@@ -83,9 +77,7 @@
     SUBDIR += rtgui
     SUBDIR += rtorrent
     SUBDIR += shx
-    SUBDIR += solidcoin
     SUBDIR += squall
-    SUBDIR += teknap
     SUBDIR += torrentsniff
     SUBDIR += transmission
     SUBDIR += transmission-cli
@@ -108,7 +100,6 @@
     SUBDIR += verlihub-plugins-luascript
     SUBDIR += verlihub-plugins-messanger
     SUBDIR += verlihub-plugins-stats
-    SUBDIR += vhcp
     SUBDIR += vuze
     SUBDIR += xnap
     SUBDIR += zetacoin
diff --git a/net-p2p/azureus2/Makefile b/net-p2p/azureus2/Makefile
deleted file mode 100644
index e8dc82002056..000000000000
--- a/net-p2p/azureus2/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-# Created by: Jeremy Faulkner <gldisater@gldis.ca>
-# $FreeBSD$
-
-PORTNAME=	azureus2
-PORTVERSION=	2.5.0.4
-PORTREVISION=	5
-CATEGORIES=	net-p2p java
-MASTER_SITES=	SF/azureus/x_obsolete/azureus-${PORTVERSION}
-DISTNAME=	azureus_${PORTVERSION}_source
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	BitTorrent client written in Java
-
-BROKEN=		Fails to build
-
-BUILD_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
-		${JAVALIBDIR}/commons-cli.jar:${PORTSDIR}/java/jakarta-commons-cli \
-		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
-		${JAVALIBDIR}/${SWT}.jar:${PORTSDIR}/x11-toolkits/${SWT}
-RUN_DEPENDS=	${JAVALIBDIR}/${SWT}.jar:${PORTSDIR}/x11-toolkits/${SWT}
-
-USE_JAVA=	yes
-JAVA_VERSION=	1.6+
-JAVA_OS=	native
-USE_ANT=	yes
-
-USES=		dos2unix zip
-DOS2UNIX_FILES=	org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java \
-		org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java
-
-NO_WRKSUBDIR=	yes
-
-JARFILE=	${PORTNAME}.jar
-
-OPTIONS_DEFINE=	SWTDEVEL
-SWTDEVEL_DESC=	Use SWT Development port
-
-# build classpath from BUILD_DEPENDS
-MAKE_ENV=	LANG=C
-CLASSPATH_JARS=	${BUILD_DEPENDS:C/:.+$//:M*.jar}
-
-PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} \
-		bin/${PORTNAME}
-
-SUB_FILES=	${PORTNAME}
-SUB_LIST=	LIBDIR="${LOCALBASE}/lib" JARFILE="${JARFILE}" \
-		SWTJAR="${JAVALIBDIR}/${SWT}.jar" JAVA="${LOCALBASE}/bin/java"
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSWTDEVEL}
-SWT=		swt-devel
-.else
-SWT=		swt
-.endif
-
-CLASSPATH=.
-.for jar in ${CLASSPATH_JARS}
-CLASSPATH:=${CLASSPATH}:${jar}
-.endfor
-
-post-patch:
-	@${SED} -E -e 's|%%CLASSPATH%%|${CLASSPATH}|' \
-		${FILESDIR}/build.xml > ${WRKSRC}/build.xml
-# bash -> sh
-	@${REINPLACE_CMD} -E -e 's|/bin/bash|${SH}|' \
-		${WRKSRC}/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java
-
-do-install:
-	${MKDIR} ${JAVAJARDIR}
-	${INSTALL_DATA} ${WRKSRC}/dist/lib/${JARFILE} ${JAVAJARDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-
-post-install:
-	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
-
-.include <bsd.port.mk>
diff --git a/net-p2p/azureus2/distinfo b/net-p2p/azureus2/distinfo
deleted file mode 100644
index 137f0695821a..000000000000
--- a/net-p2p/azureus2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (azureus_2.5.0.4_source.zip) = 9ae32cbf88baf04b0e17456e92bc2634dd54e890dbece7211a83318b96d1b081
-SIZE (azureus_2.5.0.4_source.zip) = 6482560
diff --git a/net-p2p/azureus2/files/azureus2.in b/net-p2p/azureus2/files/azureus2.in
deleted file mode 100644
index bc809249a293..000000000000
--- a/net-p2p/azureus2/files/azureus2.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-# java
-export JAVA_VERSION="%%JAVA_VERSION%%"
-export JAVA_OS="%%JAVA_OS%%"
-
-ECLIPSE_BASE=%%LOCALBASE%%/eclipse
-ECLIPSE_SWT_JAR=%%SWTJAR%%
-LIB_PATH=%%LIBDIR%%
-
-CLASS_PATH=:%%JAVAJARDIR%%/%%JARFILE%%:${ECLIPSE_SWT_JAR}
-
-if [ "${DEBUG}" ]
-then
-	echo "ECLIPSE_BASE = ${ECLIPSE_BASE}"
-	echo "ECLIPSE_WS = ${ECLIPSE_WS}"
-	echo "ECLIPSE_SWT = ${ECLIPSE_SWT}"
-	echo "ECLIPSE_SWT_JAR = ${ECLIPSE_SWT_JAR}"
-	echo "CLASS_PATH = ${CLASS_PATH}"
-	echo "LIB_PATH = ${LIB_PATH}"
-fi
-
-exec "%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=FreeBSD" "-Dazureus.config.path=${HOME}/.Azureus" "-Duser.dir=${HOME}/.Azureus" org.gudy.azureus2.ui.swt.Main "${@}"
diff --git a/net-p2p/azureus2/files/build.xml b/net-p2p/azureus2/files/build.xml
deleted file mode 100644
index 46279003defc..000000000000
--- a/net-p2p/azureus2/files/build.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!-- Under a BSDL license. Copyright by Mario S F Ferreira <lioux@FreeBSD.org> 2005- -->
-<!-- Under a BSDL license. Copyright by jrandom 2005- -->
-<!-- $FreeBSD$ -->
-<project basedir="." default="dist" name="azureus">
-     <description>
-	Builds Azureus
-     </description>
-   <!-- set global properties for this build -->
-   <property name="src" location="src"/>
-   <property name="build" location="build"/>
-   <property name="dist" location="dist"/>
-
-   <target name="init">
-     <!-- Create the time stamp -->
-     <tstamp/>
-     <!-- Create the build directory structure used by compile -->
-     <mkdir dir="${build}"/>
-   </target>
-
-   <target name="compile" depends="init" description="compile the source " >
-     <!-- Compile the java code from ${src} into ${build} -->
-     <javac srcdir="." destdir="${build}" fork="yes" memoryMaximumSize="512m">
-       <include name="**/*.java"/>
-       <exclude name="**/Win32*.java"/>
-       <exclude name="**/swt/osx/**"/>
-       <exclude name="**/macosx/**"/>
-       <classpath path="%%CLASSPATH%%"/>
-     </javac>
-   </target>
-
-   <target name="dist" depends="compile" description="generate the distribution" >
-     <!-- Create the distribution directory -->
-     <mkdir dir="${dist}/lib"/>
-
-     <copy todir="${build}">
-       <fileset dir="." includes="**/*.gif **/*.jpg, **/*.png **/*.properties" />
-       <fileset dir="." includes="**/*.dat **/*.stf **/*.xsd" />
-       <fileset dir="." includes="**/*.css **/*.html **/*.js **/*.php **/*.tmpl **/*.txt" />
-       <fileset dir="." includes="**/*.ico **/*.wav" />
-     </copy>
-     <!-- Put everything in ${build} into the azureus.jar file -->
-     <jar jarfile="${dist}/lib/azureus2.jar" basedir="${build}"/>
-   </target>
-
-   <target name="clean" description="clean up" >
-     <!-- Delete the ${build} and ${dist} directory trees -->
-     <delete dir="${build}"/>
-     <delete dir="${dist}"/>
-   </target>
-</project>
diff --git a/net-p2p/azureus2/files/patch-TransferTypes b/net-p2p/azureus2/files/patch-TransferTypes
deleted file mode 100644
index 2c13840c877e..000000000000
--- a/net-p2p/azureus2/files/patch-TransferTypes
+++ /dev/null
@@ -1,17 +0,0 @@
---- org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java	Fri Dec 12 09:56:48 2003
-+++ org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java	Sat Jun 11 16:06:40 2005
-@@ -41,5 +41,5 @@
-         TransferData[] data = event.dataTypes;
-         for (int i = 0; i < data.length; i++) {
--          int id = data[i].type;
-+          long id = data[i].type;
-           String name = getNameFromId(id);
-           System.out.println("Data type is " + id + " " + name);
-@@ -97,5 +97,5 @@
-     return ids;
-   }
--  static String getNameFromId(int id) {
-+  static String getNameFromId(long id) {
--    switch (id) {
-+    switch ((int)id) {
-       case 1 :
diff --git a/net-p2p/azureus2/files/patch-org__gudy__azureus2__platform__macosx__access__jnilib__OSXAccess.java b/net-p2p/azureus2/files/patch-org__gudy__azureus2__platform__macosx__access__jnilib__OSXAccess.java
deleted file mode 100644
index c5cab31b137e..000000000000
--- a/net-p2p/azureus2/files/patch-org__gudy__azureus2__platform__macosx__access__jnilib__OSXAccess.java
+++ /dev/null
@@ -1,20 +0,0 @@
---- org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java.orig	Sun Sep 24 16:18:49 2006
-+++ org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java	Sun Sep 24 16:19:07 2006
-@@ -19,7 +19,7 @@
-  */
- package org.gudy.azureus2.platform.macosx.access.jnilib;
- 
--import org.eclipse.swt.internal.carbon.AEDesc;
-+// import org.eclipse.swt.internal.carbon.AEDesc;
- 
- import org.gudy.azureus2.core3.util.Debug;
- 
-@@ -42,7 +42,7 @@
- 		}
- 	}
- 
--	public static final native int AEGetParamDesc(int theAppleEvent, int theAEKeyword, int desiredType, AEDesc result);
-+//	public static final native int AEGetParamDesc(int theAppleEvent, int theAEKeyword, int desiredType, AEDesc result);
- 
- 	public static final native String getVersion();
- 	
diff --git a/net-p2p/azureus2/pkg-descr b/net-p2p/azureus2/pkg-descr
deleted file mode 100644
index b63cc7c3410c..000000000000
--- a/net-p2p/azureus2/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Azureus is a java bittorrent client. Azureus offers multiple
-torrent downloads, queuing/priority systems (on torrents and
-files), start/stop seeding options and instant access to
-numerous pieces of information about your torrents. Azureus
-now features an embedded tracker easily setup and ready to use.
-
-WWW: http://azureus.sourceforge.net/
diff --git a/net-p2p/azureus2/pkg-message b/net-p2p/azureus2/pkg-message
deleted file mode 100644
index 5cb6f3adf3d8..000000000000
--- a/net-p2p/azureus2/pkg-message
+++ /dev/null
@@ -1,14 +0,0 @@
-====================================
-============ ATTENTION =============
-====================================
-
-If you have problems running
-Azureus, make sure you have the
-latest version of all your installed
-packages.
-
-For instance, make sure the swt
-package is of version 3.2.1 or
-later.
-
-====================================
diff --git a/net-p2p/linux-jigdo/Makefile b/net-p2p/linux-jigdo/Makefile
deleted file mode 100644
index 0fd3b3e254dd..000000000000
--- a/net-p2p/linux-jigdo/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Created by: Udo Schweigert
-# $FreeBSD$
-
-PORTNAME=	jigdo
-PORTVERSION=	0.7.3
-#PORTREVISION?=	0
-PORTREVISION=	1
-CATEGORIES=	net-p2p
-MASTER_SITES=	http://atterer.net/jigdo/
-PKGNAMEPREFIX=	linux-
-DISTNAME=	jigdo-bin-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Tool designed to ease the distribution of large files
-
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
-
-ONLY_FOR_ARCHS=	i386 amd64
-USES=	tar:bzip2
-USE_LINUX=	yes
-NO_BUILD=	yes
-
-PROGRAMS=	jigdo-file
-SCRIPTS=	jigdo-lite jigdo-mirror
-
-MAN1=		jigdo-file.1 jigdo-lite.1 jigdo-mirror.1
-
-NO_STAGE=	yes
-pre-install:
-	@${BRANDELF} -t Linux ${WRKSRC}/jigdo-file
-
-do-install:
-.for i in ${PROGRAMS}
-	@${INSTALL_PROGRAM} ${WRKSRC}/$i ${PREFIX}/bin
-.endfor
-.for i in ${SCRIPTS}
-	@${INSTALL_SCRIPT} ${WRKSRC}/$i ${PREFIX}/bin
-.endfor
-.for i in ${PROGRAMS} ${SCRIPTS}
-	@${INSTALL_MAN} ${WRKSRC}/$i.1 ${PREFIX}/man/man1
-.endfor
-
-.include <bsd.port.mk>
diff --git a/net-p2p/linux-jigdo/distinfo b/net-p2p/linux-jigdo/distinfo
deleted file mode 100644
index ec4e60d271ab..000000000000
--- a/net-p2p/linux-jigdo/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (jigdo-bin-0.7.3.tar.bz2) = 58b8a6885822e55f365c99131c906f16ceaaf657c566e10f410d026704cad157
-SIZE (jigdo-bin-0.7.3.tar.bz2) = 1018170
diff --git a/net-p2p/linux-jigdo/pkg-descr b/net-p2p/linux-jigdo/pkg-descr
deleted file mode 100644
index 8ed8a854201a..000000000000
--- a/net-p2p/linux-jigdo/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Jigsaw Download, or short jigdo, is a tool designed to ease the distribution
-of very large files over the internet, for example CD or DVD images. Its aim
-is to make downloading the images as easy for users as a click on a direct
-download link in a browser, while avoiding all the problems that server
-administrators have with hosting such large files.
-
-At the moment this port is only tested to work for building the iso images
-of the Debian GNU/Linux distribution.
-
-WWW: http://home.in.tum.de/~atterer/jigdo/
-
-	-- Udo		(udo.schweigert@siemens.com)
diff --git a/net-p2p/linux-jigdo/pkg-plist b/net-p2p/linux-jigdo/pkg-plist
deleted file mode 100644
index ac6e007b2b14..000000000000
--- a/net-p2p/linux-jigdo/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/jigdo-file
-bin/jigdo-lite
-bin/jigdo-mirror
diff --git a/net-p2p/mldonkey-perlreactor/Makefile b/net-p2p/mldonkey-perlreactor/Makefile
deleted file mode 100644
index 8b4e99e6d6b7..000000000000
--- a/net-p2p/mldonkey-perlreactor/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	mldonkey
-PORTVERSION=	0.2
-CATEGORIES=	net-p2p perl5
-MASTER_SITES=	SF/remotefilesync/perlreactor/perlreactor%20${PORTVERSION}
-PKGNAMESUFFIX=	-perlreactor
-DISTNAME=	perlreactor_${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Automatically add links found in web pages to MLDonkey queue
-
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-USES=		shebangfix perl5
-SHEBANG_FILES$=${BINARY_NAME}
-
-BINARY_NAME=	perlreactor
-
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -i '' -e '1d'	${WRKSRC}/${BINARY_NAME}
-
-do-install:
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-	@${CHMOD} 0755 ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-	@${INSTALL_DATA} ${WRKDIR}/README ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-.endif
-	@${INSTALL_SCRIPT} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin
-
-post-install:
-	@${SED} -e 's|/usr/local/|${PREFIX}/|' ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/net-p2p/mldonkey-perlreactor/distinfo b/net-p2p/mldonkey-perlreactor/distinfo
deleted file mode 100644
index b417b6e92263..000000000000
--- a/net-p2p/mldonkey-perlreactor/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (perlreactor_0.2.tar.gz) = 1cbbba379a823ceca1f5378df8390a5edc06f1319b8d3b5c0bfee98174533e81
-SIZE (perlreactor_0.2.tar.gz) = 2447
diff --git a/net-p2p/mldonkey-perlreactor/pkg-descr b/net-p2p/mldonkey-perlreactor/pkg-descr
deleted file mode 100644
index cc6756ec55d5..000000000000
--- a/net-p2p/mldonkey-perlreactor/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-[ excerpt from developer's www site]
-PerlReactor is a Perl script that scans donkeypages like sharereactor
-for new releases and puts them in your mldonkey queue. It was written
-to stay up-to-date with episodes of TV series without looking at
-sharereactor everyday.
-
-WWW: http://remotefilesync.sourceforge.net/perlreactor/
diff --git a/net-p2p/mldonkey-perlreactor/pkg-message b/net-p2p/mldonkey-perlreactor/pkg-message
deleted file mode 100644
index 4b234f162fa0..000000000000
--- a/net-p2p/mldonkey-perlreactor/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-	ATTENTIONATTENTION:
-
-Please make sure that you read
-/usr/local/share/doc/mldonkey-perlreactor/README. It contains
-important information about configuring perlreactor.
-
-This port/package merely installed the program, you now need to
-both configure and enable it.
-
-If your mldonkey runs on a different machine than the script or if
-you have set a http-password, you have to edit the top of the script
-to make it work.
diff --git a/net-p2p/mldonkey-perlreactor/pkg-plist b/net-p2p/mldonkey-perlreactor/pkg-plist
deleted file mode 100644
index d81cdb1b2021..000000000000
--- a/net-p2p/mldonkey-perlreactor/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/perlreactor
-%%PORTDOCS%%share/doc/mldonkey-perlreactor/README
-%%PORTDOCS%%@dirrm share/doc/mldonkey-perlreactor
diff --git a/net-p2p/mldonkey-urlslave/Makefile b/net-p2p/mldonkey-urlslave/Makefile
deleted file mode 100644
index a263bac2d6ae..000000000000
--- a/net-p2p/mldonkey-urlslave/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	mldonkey
-PORTVERSION=	0.0.1
-PORTREVISION=	4
-CATEGORIES=	net-p2p perl5
-MASTER_SITES=	http://home.ircnet.de/cru/ed2k_urlslave/dist/
-PKGNAMESUFFIX=	-urlslave
-DISTNAME=	mlurlslave-v${PORTVERSION:S/^0.0.//}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GTK+ enabled Perl script for adding ed2k:// links to MLDonkey
-
-BUILD_DEPENDS=	p5-Gtk>=0:${PORTSDIR}/x11-toolkits/p5-Gtk
-
-NO_BUILD=	yes
-USES=		shebangfix perl5
-SHEBANG_FILES=	${BINARY_NAME}
-
-BINARY_NAME=	mlurlslave
-
-NO_STAGE=	yes
-post-extract:
-	@${GREP} '^#' ${WRKSRC}/${BINARY_NAME} | ${GREP} -v '/usr/bin/perl' > ${WRKDIR}/README
-
-do-install:
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-	@${CHMOD} 0755 ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-	@${INSTALL_DATA} ${WRKDIR}/README ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-.endif
-	@${INSTALL_SCRIPT} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin
-
-post-install:
-	@${SED} -e 's|/usr/local/|${PREFIX}/|' ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/net-p2p/mldonkey-urlslave/distinfo b/net-p2p/mldonkey-urlslave/distinfo
deleted file mode 100644
index 14900884a9b9..000000000000
--- a/net-p2p/mldonkey-urlslave/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mlurlslave-v1.tar.gz) = 464e67bf8669a06941916d65f7a768128b392c80e65ea2bfeb4721c74461104f
-SIZE (mlurlslave-v1.tar.gz) = 3061
diff --git a/net-p2p/mldonkey-urlslave/pkg-descr b/net-p2p/mldonkey-urlslave/pkg-descr
deleted file mode 100644
index 000c23b1289e..000000000000
--- a/net-p2p/mldonkey-urlslave/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-ed2k://urlslave for mldonkey eases the process of adding files to
-the mldonkey download queue using ed2k:// links. It was designed
-for better ed2k:// URL handling within GNOME (especially Galeon),
-but can be used for other purposes.
-
-Author: Veit Wahlich <cru@ircnet.de>
-WWW: http://home.ircnet.de/cru/ed2k_urlslave/
diff --git a/net-p2p/mldonkey-urlslave/pkg-message b/net-p2p/mldonkey-urlslave/pkg-message
deleted file mode 100644
index a0c78fac2953..000000000000
--- a/net-p2p/mldonkey-urlslave/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-	ATTENTIONATTENTION:
-
-Please make sure that you read
-/usr/local/share/doc/mldonkey-urlslave/README. It contains important
-information about configuring and finally enabling mldonkey-urlslave
-within the GNOME Desktop.
-
-This port/package merely installed the program, you now need to
-configure it and enable it.
diff --git a/net-p2p/mldonkey-urlslave/pkg-plist b/net-p2p/mldonkey-urlslave/pkg-plist
deleted file mode 100644
index cc31a9ba302b..000000000000
--- a/net-p2p/mldonkey-urlslave/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/mlurlslave
-%%PORTDOCS%%share/doc/mldonkey-urlslave/README
-%%PORTDOCS%%@dirrm share/doc/mldonkey-urlslave
diff --git a/net-p2p/museekplus/Makefile b/net-p2p/museekplus/Makefile
deleted file mode 100644
index c8102b09e457..000000000000
--- a/net-p2p/museekplus/Makefile
+++ /dev/null
@@ -1,108 +0,0 @@
-# Created by: Stefan Walter <stefan@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	museekplus
-PORTVERSION=	0.1.13
-PORTREVISION=	9
-CATEGORIES=	net-p2p
-MASTER_SITES=	SF/museek-plus/museek-plus/${PORTVERSION}
-DISTNAME=	museek+-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	SoulSeek client with separate terminal and Qt based interface
-
-LIB_DEPENDS=	libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26
-BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
-
-USES=		fam pkgconfig scons tar:bzip2
-
-MAKE_ARGS+=	QTDIR=${QT_PREFIX} QT_LIB=qt-mt PREFIX=${PREFIX} VORBIS=yes
-DATADIR=	share/museek
-MAN1=		musetup.1 mulog.1 museekcontrol.1 muscan.1 muscand.1 museekd.1
-
-OPTIONS_DEFINE=	MUSETUPGTK PYMUCIPHER VORBIS MURMUR MUCOUS OPTIMIZED_CFLAGS DEBUG
-OPTIONS_DEFAULT=	MUSETUPGTK PYMUCIPHER VORBIS
-MUSETUPGTK_DESC=	Install musetup-gtk
-PYMUCIPHER_DESC=	Install python bindings for Mucipher
-MURMUR_DESC=		Install PyGTK client
-MUCOUS_DESC=		Install Curses Python client
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPYMUCIPHER} || ${PORT_OPTIONS:MBINDINGS} || ${PORT_OPTIONS:MMURMUR} || ${PORT_OPTIONS:MCLIENTS} || ${PORT_OPTIONS:MMUCOUS}
-USE_PYTHON=	yes
-.endif
-
-MAKE_ARGS+=	MUSEEQ=no
-PLIST_SUB+=	MUSEEQ="@comment "
-MAKE_ARGS+=	QSA=no
-
-.if ${PORT_OPTIONS:MVORBIS}
-MAKE_ARGS+=	VORBIS=yes
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
-.else
-MAKE_ARGS+=	VORBIS=no
-.endif
-
-.if ${PORT_OPTIONS:MMUSETUPGTK}
-MAKE_ARGS+=	MUSETUPGTK=yes
-MAN1+=		musetup-gtk.1
-PLIST_SUB+=	MUSETUPGTK=""
-.else
-MAKE_ARGS+=	MUSETUPGTK=no
-PLIST_SUB+=	MUSETUPGTK="@comment "
-.endif
-.if ${PORT_OPTIONS:MPYMUCIPHER}
-MAKE_ARGS+=	PYMUCIPHER=yes
-PLIST_SUB+=	PYMUCIPHER=""
-.else
-MAKE_ARGS+=	PYMUCIPHER=no
-PLIST_SUB+=	PYMUCIPHER="@comment "
-.endif
-.if ${PORT_OPTIONS:MMURMUR}
-MAKE_ARGS+=	MURMUR=yes
-MAN1+=		murmur.1
-PLIST_SUB+=	MURMUR=""
-.else
-MAKE_ARGS+=	MURMUR=no
-PLIST_SUB+=	MURMUR="@comment "
-.endif
-.if ${PORT_OPTIONS:MMUCOUS}
-MAKE_ARGS+=	MUCOUS=yes
-MAN1+=		mucous.1
-PLIST_SUB+=	MUCOUS=""
-.else
-MAKE_ARGS+=	MUCOUS=no
-PLIST_SUB+=	MUCOUS="@comment "
-.endif
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-MAKE_ARGS+=	RELEASE=yes
-.else
-MAKE_ARGS+=	RELEASE=no
-.endif
-.if ${PORT_OPTIONS:MDEBUG}
-MAKE_ARGS+=	MULOG="cycle,debug"
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} \
-		-e "s,%%PYTHONPREFIX_SITELIBDIR%%,${PYTHONPREFIX_SITELIBDIR},g"\
-		${WRKSRC}/Mucipher/python/SConscript \
-		${WRKSRC}/mucous/pymucous/SConscript \
-		${WRKSRC}/murmur/pymurmur/SConscript \
-		${WRKSRC}/museekd/SConscript \
-		${WRKSRC}/python-bindings/museek/SConscript
-
-post-install:
-.if ${PORT_OPTIONS:MMUCOUS}
-	@${REINPLACE_CMD} -i "" -e "s,/usr/bin/python,${PYTHON_CMD},g" ${PREFIX}/bin/mucous
-.endif
-.if ${PORT_OPTIONS:MMUSETUPGTK}
-	@${REINPLACE_CMD} -i "" -e "s,/usr/bin/python,${PYTHON_CMD},g" ${PREFIX}/bin/musetup-gtk
-.endif
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
-
-.include <bsd.port.mk>
diff --git a/net-p2p/museekplus/distinfo b/net-p2p/museekplus/distinfo
deleted file mode 100644
index 5167930097f5..000000000000
--- a/net-p2p/museekplus/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (museek+-0.1.13.tar.bz2) = e1958556b30dee59eb7648973432d4d048f30c79f38ab7145fca6f0f2690473e
-SIZE (museek+-0.1.13.tar.bz2) = 1186870
diff --git a/net-p2p/museekplus/files/patch-Mucipher_python_SConscript b/net-p2p/museekplus/files/patch-Mucipher_python_SConscript
deleted file mode 100644
index 7eac66f45a16..000000000000
--- a/net-p2p/museekplus/files/patch-Mucipher_python_SConscript
+++ /dev/null
@@ -1,10 +0,0 @@
---- Mucipher/python/SConscript.orig	Sat Aug 12 13:50:30 2006
-+++ Mucipher/python/SConscript	Sat Aug 12 13:51:26 2006
-@@ -38,6 +38,6 @@
- 
-        mucipherc = mucipherc[0]
--    py_dest = env['DESTDIR'] + os.path.join(sys.prefix, "lib", "python" + py_ver, "site-packages")
-+    py_dest = env['DESTDIR'] + "%%PYTHONPREFIX_SITELIBDIR%%"
- 
-    dp1 = env_swigpy.Install(py_dest, 'mucipherc.py')
- 
diff --git a/net-p2p/museekplus/files/patch-Tools_SConscript b/net-p2p/museekplus/files/patch-Tools_SConscript
deleted file mode 100644
index 8d21fa0d09e0..000000000000
--- a/net-p2p/museekplus/files/patch-Tools_SConscript
+++ /dev/null
@@ -1,13 +0,0 @@
---- Tools/SConscript.orig	2010-04-09 00:32:23.000000000 +0200
-+++ Tools/SConscript	2010-04-09 00:32:48.000000000 +0200
-@@ -24,10 +24,7 @@
- 				major, minor, micro = sv[0], sv[1], sv[2]
- 			else:
- 				major, minor, micro = sv[0], sv[1], 0
--			if int(minor) == 96 and int(micro) >= 93:
- 				env_libmuscan.Append(CPPDEFINES = 'HAVE_VORBIS=1')
--			else:
--				env_libmuscan.Append(CPPDEFINES = {'HAVE_VORBIS':1})
- 		except Exception, error:
- 			print "ERROR:", error
- 		print "OGG Vorbis found, compiling into muscan."
diff --git a/net-p2p/museekplus/files/patch-mucous_pymucous_SConscript b/net-p2p/museekplus/files/patch-mucous_pymucous_SConscript
deleted file mode 100644
index 5aafa5f8c66c..000000000000
--- a/net-p2p/museekplus/files/patch-mucous_pymucous_SConscript
+++ /dev/null
@@ -1,11 +0,0 @@
---- mucous/pymucous/SConscript.orig	Sat Aug 12 14:06:25 2006
-+++ mucous/pymucous/SConscript	Sat Aug 12 14:07:11 2006
-@@ -8,7 +8,7 @@
- 
- import sys, os
- py_ver = str(sys.version_info[0]) + "." + str(sys.version_info[1])
--py_dest = env['DESTDIR'] + os.path.join(sys.prefix, "lib", "python" + py_ver, "site-packages", "pymucous")
-+py_dest = env['DESTDIR'] + os.path.join("%%PYTHONPREFIX_SITELIBDIR%%", "pymucous")
- 
- install = env.Install(py_dest, files)
- env.Alias('install_mucous', install)
diff --git a/net-p2p/museekplus/files/patch-murmur_pymurmur_SConscript b/net-p2p/museekplus/files/patch-murmur_pymurmur_SConscript
deleted file mode 100644
index b545c57bda23..000000000000
--- a/net-p2p/museekplus/files/patch-murmur_pymurmur_SConscript
+++ /dev/null
@@ -1,11 +0,0 @@
---- murmur/pymurmur/SConscript.orig	2007-08-23 18:03:02.000000000 +0300
-+++ murmur/pymurmur/SConscript	2007-10-18 11:25:48.000000000 +0300
-@@ -11,7 +11,7 @@
- 
- import sys, os
- py_ver = str(sys.version_info[0]) + "." + str(sys.version_info[1])
--py_dest = env['DESTDIR'] + os.path.join(sys.prefix, "lib", "python" + py_ver, "site-packages", "pymurmur")
-+py_dest = env['DESTDIR'] + os.path.join("%%PYTHONPREFIX_SITELIBDIR%%", "pymurmur")
- 
- install = env.Install(py_dest, files)
- env.Alias('install_murmur', install)
diff --git a/net-p2p/museekplus/files/patch-museeq_SConscript b/net-p2p/museekplus/files/patch-museeq_SConscript
deleted file mode 100644
index ec795e4286cd..000000000000
--- a/net-p2p/museekplus/files/patch-museeq_SConscript
+++ /dev/null
@@ -1,10 +0,0 @@
---- museeq/SConscript.orig	Mon Nov 22 16:01:35 2004
-+++ museeq/SConscript	Mon Nov 22 17:29:36 2004
-@@ -123,6 +123,7 @@
- 
- sys.stdout.write("Checking Qt library...")
- sys.stdout.flush()
-+env_qt.Append(LINKFLAGS = ['-pthread'])
- if not conf.TryLink('#include <qapplication.h>\nint main() {};\n', ".cpp"):
-     env_qt.Replace(QT_LIB = "qt-mt")
-     if not conf.TryLink('#include <qapplication.h>\nint main() {};\n', ".cpp"):
diff --git a/net-p2p/museekplus/files/patch-python-bindings_museek_SConscript b/net-p2p/museekplus/files/patch-python-bindings_museek_SConscript
deleted file mode 100644
index 02eadc281767..000000000000
--- a/net-p2p/museekplus/files/patch-python-bindings_museek_SConscript
+++ /dev/null
@@ -1,11 +0,0 @@
---- python-bindings/museek/SConscript.orig	2007-08-21 09:25:18.000000000 +0300
-+++ python-bindings/museek/SConscript	2007-10-18 11:30:12.000000000 +0300
-@@ -8,7 +8,7 @@
- 
- import sys, os
- py_ver = str(sys.version_info[0]) + "." + str(sys.version_info[1])
--py_dest = env['DESTDIR'] + os.path.join(sys.prefix, "lib", "python" + py_ver, "site-packages", "museek")
-+py_dest = env['DESTDIR'] + os.path.join("%%PYTHONPREFIX_SITELIBDIR%%", "museek")
- 
- install = env.Install(py_dest, files)
- env.Alias('install_pymuseekd', install)
diff --git a/net-p2p/museekplus/pkg-descr b/net-p2p/museekplus/pkg-descr
deleted file mode 100644
index fbb46894b0cf..000000000000
--- a/net-p2p/museekplus/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Museek+ (or Museek-Plus) is an enhanced fork of Museek, a file-sharing
-application for the Soulseek peer-to-peer network. The actual SoulSeek client
-and the GUI are separate programs that communicate via Unix or network sockets.
-
-WWW: http://www.museek-plus.org/
diff --git a/net-p2p/museekplus/pkg-message b/net-p2p/museekplus/pkg-message
deleted file mode 100644
index 2447a74c731e..000000000000
--- a/net-p2p/museekplus/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-**
-** For initial configuration (login, password, etc.) of the Soulseek client,
-** please run 'musetup'.
-**
diff --git a/net-p2p/museekplus/pkg-plist b/net-p2p/museekplus/pkg-plist
deleted file mode 100644
index 0d968d5ad6f5..000000000000
--- a/net-p2p/museekplus/pkg-plist
+++ /dev/null
@@ -1,209 +0,0 @@
-%%MUCOUS%%bin/mucous
-bin/mulog
-%%MURMUR%%bin/murmur
-bin/muscan
-bin/muscand
-bin/museekcontrol
-bin/museekd
-%%MUSEEQ%%bin/museeq
-bin/musetup
-%%MUSETUPGTK%%bin/musetup-gtk
-%%PYMUCIPHER%%%%PYTHON_SITELIBDIR%%/museek/__init__.py
-%%PYMUCIPHER%%%%PYTHON_SITELIBDIR%%/museek/driver.py
-%%PYMUCIPHER%%%%PYTHON_SITELIBDIR%%/museek/messages.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/ConfigParser.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousAlerts.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousChatRooms.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousFormat.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousHelp.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousInput.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousLists.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousMuscan.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousNetworking.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousPopup.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousPrivateChat.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousRecommendations.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousRoomsList.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousSearch.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousSetup.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousShares.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousTransfers.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousUserInfo.py
-%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/__init__.py
-%%MURMUR%%%%PYTHON_SITELIBDIR%%/pymurmur/__init__.py
-%%MURMUR%%%%PYTHON_SITELIBDIR%%/pymurmur/entrydialog.py
-%%MURMUR%%%%PYTHON_SITELIBDIR%%/pymurmur/imagedata.py
-%%MURMUR%%%%PYTHON_SITELIBDIR%%/pymurmur/muscan.py
-%%MURMUR%%%%PYTHON_SITELIBDIR%%/pymurmur/settings.py
-%%MURMUR%%%%PYTHON_SITELIBDIR%%/pymurmur/utils.py
-%%DATADIR%%/museekd/config.xml.tmpl
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-banned.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-buddied.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-ignored.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-trusted.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/away.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/browser.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/chatroom.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/offline-banned.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/offline-buddied.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/offline-ignored.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/offline-trusted.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/offline.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/online-banned.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/online-buddied.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/online-ignored.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/online-trusted.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/online.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/privatechat.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/search.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/transfer.png
-%%MUSEEQ%%%%DATADIR%%/museeq/birdies/userinfo.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/away-banned.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/away-buddied.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/away-ignored.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/away-trusted.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/away.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/browser.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/chatroom.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/offline-banned.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/offline-buddied.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/offline-ignored.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/offline-trusted.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/offline.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/online-banned.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/online-buddied.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/online-ignored.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/online-trusted.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/online.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/privatechat.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/search.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/tab_remove.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/transfer.png
-%%MUSEEQ%%%%DATADIR%%/museeq/bluebox/userinfo.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/alert.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/away-banned.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/away-buddied.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/away-ignored.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/away-trusted.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/away.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/browser-small.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/browser.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/chatroom-small.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/chatroom.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/colors.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/comments.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/connect.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/disconnect.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/exit.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/help.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/icon.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/ip.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/logo.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/offline-banned.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/offline-buddied.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/offline-ignored.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/offline-trusted.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/offline.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/online-banned.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/online-buddied.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/online-ignored.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/online-trusted.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/online.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/privatechat-small.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/privatechat.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/privileges.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/protocol.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/refresh.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/search-small.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/search.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/settings.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/tab_remove.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/transfer-small.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/transfer.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/userinfo-small.png
-%%MUSEEQ%%%%DATADIR%%/museeq/default/userinfo.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/alert.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/away-banned.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/away-buddied.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/away-ignored.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/away-trusted.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/away.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/browser-small.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/browser.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/chatroom-small.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/chatroom.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/colors.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/comments.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/connect.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/disconnect.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/exit.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/help.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/icon.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/ip.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/logo.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/offline-banned.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/offline-buddied.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/offline-ignored.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/offline-trusted.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/offline.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/online-banned.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/online-buddied.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/online-ignored.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/online-trusted.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/online.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/privatechat-small.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/privatechat.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/privileges.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/protocol.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/refresh.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/search-small.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/search.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/settings.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/tab_remove.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/transfer-small.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/transfer.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/userinfo-small.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-silk/userinfo.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/away-banned.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/away-buddied.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/away-ignored.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/away-trusted.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/away.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/browser.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/chatroom.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/offline-banned.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/offline-buddied.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/offline-ignored.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/offline-trusted.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/offline.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/online-banned.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/online-buddied.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/online-ignored.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/online-trusted.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/online.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/privatechat.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/search.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/tab_remove.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/transfer.png
-%%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/userinfo.png
-%%MUSEEQ%%%%DATADIR%%/museeq/nowplaying.qs
-%%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_de.qm
-%%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_es.qm
-%%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_fr.qm
-%%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_it.qm
-%%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_nl.qm
-%%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_pl.qm
-%%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_pt_BR.qm
-%%MUSEEQ%%%%DATADIR%%/museeq/uptime.qs
-%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/translations
-%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/mikelabo-tri
-%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/mikelabo-silk
-%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/default
-%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/bluebox
-%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/birdies
-%%MUSEEQ%%@dirrm %%DATADIR%%/museeq
-@dirrm %%DATADIR%%/museekd
-@dirrm %%DATADIR%%
-%%MUCOUS%%@dirrm %%PYTHON_SITELIBDIR%%/pymucous
-%%MURMUR%%@dirrm %%PYTHON_SITELIBDIR%%/pymurmur
-%%PYMUCIPHER%%@dirrm %%PYTHON_SITELIBDIR%%/museek
diff --git a/net-p2p/opennap/Makefile b/net-p2p/opennap/Makefile
deleted file mode 100644
index 826f43da4fc4..000000000000
--- a/net-p2p/opennap/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by: Donald Burr <dburr@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	opennap
-PORTVERSION=	0.44
-PORTREVISION=	1
-CATEGORIES=	net-p2p
-MASTER_SITES=	SF
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Open-source Napster server
-
-USES=		gmake
-GNU_CONFIGURE=	YES
-PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	pkg-message
-
-NO_STAGE=	yes
-post-install:
-	(${ECHO_CMD} "" ; ${ECHO_CMD} "admin" ; ${ECHO_CMD} "opennap" ; ${ECHO_CMD} "") | ${WRKSRC}/setup
-.if defined(NOPORTDOCS)
-	@${ECHO_MSG} "===> Documentation skipped."
-.else
-	@${ECHO_MSG} "===> Installing documentation into ${PREFIX}/share/doc/opennap."
-	@${MKDIR} ${PREFIX}/share/doc/opennap
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/opennap
-	${INSTALL_DATA} ${WRKSRC}/napster.txt ${PREFIX}/share/doc/opennap
-.endif
-	@${ECHO_MSG} "===> Installing example config files into ${PREFIX}/share/doc/opennap."
-	@${MKDIR} ${PREFIX}/share/opennap/examples
-	${CHOWN} -R nobody:nobody ${PREFIX}/share/opennap
-	cd ${WRKSRC} ; for FILE in sample.*; do ${INSTALL_DATA} $${FILE} ${PREFIX}/share/opennap/examples ; done
-	@${ECHO_MSG} "===> Installing startup script into ${PREFIX}/etc/rc.d."
-	${INSTALL_SCRIPT} ${FILESDIR}/opennap.sh ${PREFIX}/etc/rc.d
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/net-p2p/opennap/distinfo b/net-p2p/opennap/distinfo
deleted file mode 100644
index dba59225858c..000000000000
--- a/net-p2p/opennap/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (opennap-0.44.tar.gz) = 9de766b0833ef023bb647ac4ec89001e2d1d524f16bf95a58011e685bd640a00
-SIZE (opennap-0.44.tar.gz) = 330323
diff --git a/net-p2p/opennap/files/opennap.sh b/net-p2p/opennap/files/opennap.sh
deleted file mode 100644
index ecf5937fc025..000000000000
--- a/net-p2p/opennap/files/opennap.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)
-	if [ -x ${PREFIX}/sbin/opennap ]; then
-		${PREFIX}/sbin/opennap > /dev/null 2>&1 &
-		echo -n ' opennap'
-	fi
-	;;
-stop)
-	[ -r ${PREFIX}/share/opennap/pid ] && kill -15 `cat ${PREFIX}/share/opennap/pid` > /dev/null && rm -f ${PREFIX}/share/opennap/pid && echo -n ' opennap'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
diff --git a/net-p2p/opennap/files/pkg-message.in b/net-p2p/opennap/files/pkg-message.in
deleted file mode 100644
index 475a03b6158c..000000000000
--- a/net-p2p/opennap/files/pkg-message.in
+++ /dev/null
@@ -1,25 +0,0 @@
-*************************************************
-
-A default administrator user has been created.
-The user name is 'admin', password 'opennap'.
-You will probably want to change these.
-To do so, edit the file
-%%PREFIX%%/share/opennap/users .
-
-Example configuration files are located in
-%%PREFIX%%/share/opennap/examples/ .  Copy
-them to %%PREFIX%%/share/opennap, removing the
-'sample.' prefix (e.g. 'sample.conf' becomes
-'conf') and edit to your preferences.
-
-Documentation is installed under
-%%PREFIX%%/share/doc/opennap .
-
-If you would like to link your server to the
-global Napigator search system, go to
-http://www.napigator.com/ and follow the
-directions under "CAN I RUN MY OWN NAP SERVER?"
-
-Have fun!
-
-*************************************************
diff --git a/net-p2p/opennap/pkg-descr b/net-p2p/opennap/pkg-descr
deleted file mode 100644
index 2ee0d95aa682..000000000000
--- a/net-p2p/opennap/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Napster is a protocol for sharing files between users. With Napster,
-the files stay on the client machine, never passing through
-the server. The server provides the ability to search for particular
-files and initiate a direct transfer between the clients. In
-addition, chat forums similar to IRC are available. OpenNap extends
-the Napster protocol to allow sharing of any media type,
-and the ability to link servers together. 
-
-WWW: http://opennap.sourceforge.net/
diff --git a/net-p2p/opennap/pkg-plist b/net-p2p/opennap/pkg-plist
deleted file mode 100644
index 36a5302a893b..000000000000
--- a/net-p2p/opennap/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-sbin/opennap
-sbin/metaserver
-sbin/setup
-share/opennap/users
-share/opennap/examples/sample.block
-share/opennap/examples/sample.channels
-share/opennap/examples/sample.config
-share/opennap/examples/sample.filter
-share/opennap/examples/sample.motd
-share/opennap/examples/sample.servers
-share/opennap/examples/sample.users
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/napster.txt
-@dirrm share/opennap/examples
-@dirrm share/opennap
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-etc/rc.d/opennap.sh
diff --git a/net-p2p/solidcoin/Makefile b/net-p2p/solidcoin/Makefile
deleted file mode 100644
index 1f7cac8bb4d8..000000000000
--- a/net-p2p/solidcoin/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# Created by: Dmitriy Limonov
-# $FreeBSD$
-
-PORTNAME=	solidcoin
-PORTVERSION=	2.041
-PORTREVISION=	7
-CATEGORIES=	net-p2p finance
-MASTER_SITES=	http://downloads.solidcoin.info/ \
-		http://dl.dropbox.com/u/47582909/
-DISTNAME=	${PORTNAME}-source-${PORTVERSION:S/.//g}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Alternative Bitcoin peer-to-peer currency client
-
-LICENSE=	MIT
-
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/parallel/algorithm.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
-
-BROKEN=		Does not build with any of the supported wx
-
-OPTIONS_DEFINE=	WXGTK
-OPTIONS_DEFAULT=	WXGTK
-
-WRKSRC=		${WRKDIR}/src
-
-USES=		gmake dos2unix zip
-USE_GNOME=	glib20
-USE_OPENSSL=	yes
-USE_BDB=	yes
-WANT_BDB_VER=	47
-USE_GCC=	any
-ALL_TARGET=	${BINARY}
-
-CXXFLAGS+=	-Wno-invalid-offsetof
-CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
-LDFLAGS+=	-L${BDB_LIB_DIR} -L${LOCALBASE}/lib
-
-PLIST_FILES=	bin/${BINARY}
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MWXGTK}
-USE_WX=		3.0
-WX_UNICODE=	yes
-PLIST_FILES+=	share/pixmaps/solidcoin48.xpm
-DESKTOP_ENTRIES="SolidCoin" "" "${PREFIX}/share/pixmaps/solidcoin48.xpm" \
-		"${PORTNAME}" "" true
-BINARY=		solidcoin
-.else
-BINARY=		solidcoind
-.endif
-
-post-patch:
-.for i in crypto gui nogui
-	@${MKDIR} ${WRKSRC}/../obj/${i}
-.endfor
-	@${ECHO_CMD} '18i\' > ${WRKDIR}/sed.in
-	@${ECHO_CMD} '#ifndef __STDC_LIMIT_MACROS' >> ${WRKDIR}/sed.in
-	@${ECHO_CMD} '19i\' >> ${WRKDIR}/sed.in
-	@${ECHO_CMD} '#endif' >> ${WRKDIR}/sed.in
-	@${REINPLACE_CMD} \
-		-f ${WRKDIR}/sed.in \
-		${WRKSRC}/headers.h
-
-do-configure:
-	@cd ${WRKSRC} && ${SED} -e \
-		's|^CXX=|CXX?=| ; \
-		 s|shell .* |shell $$(WX_CONFIG) | ; \
-		 s|-Wl,-Bstatic|| ; ; \
-		 s|-Wl,-Bdynamic|| ; \
-		 /-l dl/d ; \
-		 s|-l pthread|$$(LDFLAGS)|; \
-		 s|^CXXFLAGS=-O2|CXXFLAGS+=$$(CPPFLAGS)|' \
-		< ../build/makefile.unix > Makefile
-
-do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${BINARY} ${PREFIX}/bin)
-.if ${PORT_OPTIONS:MWXGTK}
-	(cd ${WRKSRC}/../share/xpm && ${INSTALL_DATA} solidcoin48.xpm \
-		${PREFIX}/share/pixmaps)
-.endif
-
-.include <bsd.port.mk>
diff --git a/net-p2p/solidcoin/distinfo b/net-p2p/solidcoin/distinfo
deleted file mode 100644
index 837ee75af81c..000000000000
--- a/net-p2p/solidcoin/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (solidcoin-source-2041.zip) = bbf2210d831c2d46a4b14db1fa74dcab93f8bbdb37598ee56395347fb94ac764
-SIZE (solidcoin-source-2041.zip) = 485326
diff --git a/net-p2p/solidcoin/files/patch-uibase.cpp b/net-p2p/solidcoin/files/patch-uibase.cpp
deleted file mode 100644
index 49345fdcd81c..000000000000
--- a/net-p2p/solidcoin/files/patch-uibase.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- uibase.cpp.orig
-+++ uibase.cpp
-@@ -139,7 +139,7 @@
- 
-     m_WalletSelect = new wxComboBox(this, wxID_ANY, wxEmptyString,wxDefaultPosition,wxDefaultSize,0,0,wxCB_READONLY);
-     m_WalletSelect->SetToolTip(wxT("Change your wallet to view other transactions and address books"));
--    wxFont font2(15, wxFONTFAMILY_TELETYPE, wxNORMAL, wxBOLD);
-+    wxFont font2(15, wxFONTFAMILY_TELETYPE, wxNORMAL, wxBOLD, false, wxEmptyString, wxFONTENCODING_DEFAULT);
-     m_WalletSelect->SetFont(font2);
- 
- 
-@@ -162,7 +162,7 @@
- 	wxBoxSizer* bSizer66;
- 	bSizer66 = new wxBoxSizer( wxHORIZONTAL );
- 
--    wxFont font3(12, wxFONTFAMILY_DEFAULT, wxNORMAL, wxNORMAL);
-+    wxFont font3(12, wxFONTFAMILY_DEFAULT, wxNORMAL, wxNORMAL, false, wxEmptyString, wxFONTENCODING_DEFAULT);
-     m_toolBar = new wxToolBar(this, wxID_ANY ,wxDefaultPosition,wxDefaultSize,wxTB_TEXT|wxTB_HORZ_LAYOUT |wxTB_FLAT );
- 
- 	m_toolBar->SetToolBitmapSize( wxSize( 20,20 ) );
diff --git a/net-p2p/solidcoin/pkg-descr b/net-p2p/solidcoin/pkg-descr
deleted file mode 100644
index 085a7bd31688..000000000000
--- a/net-p2p/solidcoin/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-SolidCoin is an open source digital currency, originally based on Bitcoin,
-but now heavily modified and improved. SolidCoin works over a distributed
-peer-to-peer network to offer irreversible, low-cost, anonymous and
-decentralized monetary transactions.
-
-WWW: http://solidcoin.info
diff --git a/net-p2p/teknap/Makefile b/net-p2p/teknap/Makefile
deleted file mode 100644
index 2201cc42887f..000000000000
--- a/net-p2p/teknap/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-# Created by: Carl Johan Madestrand
-# $FreeBSD$
-
-PORTNAME=	TekNap
-PORTVERSION=	1.3.g
-PORTREVISION=	3
-CATEGORIES=	net-p2p
-MASTER_SITES=	http://www.epicsol.org/~brian/got.net-archive/teknap/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.g/g/}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Console napster client
-
-.if defined(WITH_MP3)
-BUILD_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
-.endif
-.if defined(WITH_XMMS)
-BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
-.endif
-
-WRKSRC=		${WRKDIR}/TekNap
-
-PLIST_FILES=	bin/TekNap \
-		bin/TekNap-1.3g
-
-USES=	gmake
-WANT_GNOME=	yes
-GNU_CONFIGURE=	yes
-DOCSDIR=	${PREFIX}/share/doc/TekNap
-PORTDOCS=	*
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mgtk12}!=""
-USE_GNOME+=	gtk12
-CONFIGURE_ARGS+=--with-gtk
-PKGNAMESUFFIX=	-gtk
-.else
-CONFIGURE_ARGS+=--without-gtk
-.endif
-
-.if defined(WITH_MP3)
-CONFIGURE_ARGS+=--enable-mp3
-.endif
-
-.if defined(WITH_XMMS)
-CONFIGURE_ARGS+=--enable-xmms
-.endif
-
-pre-extract:
-	@${ECHO} "Available switches:"
-	@${ECHO} "-------------------"
-	@${ECHO} "WITH_MP3 - Support MP3 playback"
-	@${ECHO} "WITH_XMMS - Support XMMS"
-
-pre-configure:
-	@${REINPLACE_CMD} -e "s:-lc_r:${PTHREAD_LIBS}:g" ${WRKSRC}/configure
-
-post-patch:
-	@${REINPLACE_CMD} -e '/mkinstalldirs/ s,$$(HELPDIR) $$(NAPLIB),,g' \
-		-e "s/-I-//g" \
-		${WRKSRC}/Makefile.in
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}/help
-	${TAR} --directory ${WRKSRC}/teknap-help -cf - . | \
-	${TAR} --directory ${DOCSDIR}/help -xf -
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${ECHO}
-	@${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%DOCSDIR%%:${DOCSDIR}:g"
-	@${ECHO}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net-p2p/teknap/distinfo b/net-p2p/teknap/distinfo
deleted file mode 100644
index 4dfb0894fe0c..000000000000
--- a/net-p2p/teknap/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (TekNap-1.3g.tar.gz) = 3aead8cd1d7e9c808de759a6a705af30c3976cc23187462202ed294c82196e06
-SIZE (TekNap-1.3g.tar.gz) = 755718
diff --git a/net-p2p/teknap/files/patch-aa b/net-p2p/teknap/files/patch-aa
deleted file mode 100644
index 9ce74dbfd745..000000000000
--- a/net-p2p/teknap/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig	Thu Jun 22 11:32:39 2000
-+++ Makefile.in	Thu Jul  6 01:10:22 2000
-@@ -34,7 +34,7 @@
- NAPLIB = @NAPLIB@
- 
- CC = @CC@
--DEFS = -I$$(srcdir)/../include -I$(topdir)/include
-+DEFS = -I. -I$(topdir)/include -I-
- LIBS = @LIBS@
- INCLUDES = @INCLUDES@
- 
-@@ -58,8 +58,8 @@
- 
- # This command will be used to install the BitchX help files.  If you don't
- # want to install them, replace with the following:
--# INSTALL_HELP_CMD = @echo The help files have not been installed.
--INSTALL_HELP_CMD = cp -pr $(srcdir)/teknap-help/* $(HELPDIR)
-+INSTALL_HELP_CMD = @echo
-+#INSTALL_HELP_CMD = cp -pr $(srcdir)/teknap-help/* $(HELPDIR)
- 
- ## You probably don't need to change anything below this line
- 
diff --git a/net-p2p/teknap/files/patch-irchandler.c b/net-p2p/teknap/files/patch-irchandler.c
deleted file mode 100644
index 675904b694d3..000000000000
--- a/net-p2p/teknap/files/patch-irchandler.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- source/irchandler.c.orig	Sun Jul 20 15:08:00 2003
-+++ source/irchandler.c	Sun Jul 20 15:09:35 2003
-@@ -169,12 +169,6 @@
- 			break;
- 		case 333: /* topic time */
- 			break;
--#if 0
--ùíù Numbered server stuff: "352 pana #opennap toasty bender.thirty4.com
--          irc.lightning.net Toasty_ H@ :2 Chad Boyda" (irc.core.com)
--          ùíù Numbered server stuff: "315 pana #opennap :End of /WHO list."
--                    (irc.core.com)
--#endif
- 		case 315:
- 			break;
- 		case 352:
-@@ -943,4 +937,4 @@
- 	}
- 	from_server = ofs;
- }
-- 
-\ No newline at end of file
-+ 
diff --git a/net-p2p/teknap/files/patch-source-scott.c b/net-p2p/teknap/files/patch-source-scott.c
deleted file mode 100644
index a56058516c6d..000000000000
--- a/net-p2p/teknap/files/patch-source-scott.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- source/scott.c.orig	Fri Aug  6 17:45:27 2004
-+++ source/scott.c	Fri Aug  6 17:47:15 2004
-@@ -364,6 +364,7 @@
- 		mvwaddstr(main_win, 1, 0, buf);
- 	}
- #endif
-+		break;
- 	}
- #if 0
- 	wrefresh(main_win);
diff --git a/net-p2p/teknap/files/patch-source_share.c b/net-p2p/teknap/files/patch-source_share.c
deleted file mode 100644
index 265b8f6d82b3..000000000000
--- a/net-p2p/teknap/files/patch-source_share.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/share.c.orig	2007-11-12 15:41:18.000000000 +0100
-+++ source/share.c	2007-11-12 15:43:42.000000000 +0100
-@@ -38,7 +38,7 @@
- 
- static pthread_mutex_t quit_mutex = PTHREAD_MUTEX_INITIALIZER;
- 
--static pthread_mutex_t fserv_struct_mutex = PTHREAD_MUTEX_INITIALIZER;
-+pthread_mutex_t fserv_struct_mutex = PTHREAD_MUTEX_INITIALIZER;
- pthread_mutex_t shared_count_mutex = PTHREAD_MUTEX_INITIALIZER;
- static void share_thread_signal_setup(void);
- 
diff --git a/net-p2p/teknap/files/patch-source_term_c b/net-p2p/teknap/files/patch-source_term_c
deleted file mode 100644
index 3909338c3503..000000000000
--- a/net-p2p/teknap/files/patch-source_term_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- source/term.c.orig	Fri Jul 23 01:10:02 2004
-+++ source/term.c	Fri Jul 23 01:11:02 2004
-@@ -92,7 +92,6 @@
- #endif
- 
- extern  char    *getenv();
--extern	char	*tparm();
- 
- /*
-  * The old code assumed termcap. termcap is almost always present, but on
diff --git a/net-p2p/teknap/files/patch-source_timer.c b/net-p2p/teknap/files/patch-source_timer.c
deleted file mode 100644
index d1d8c5de7784..000000000000
--- a/net-p2p/teknap/files/patch-source_timer.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/timer.c.orig	2007-11-12 15:43:52.000000000 +0100
-+++ source/timer.c	2007-11-12 15:44:47.000000000 +0100
-@@ -145,7 +145,7 @@
-  * This is put here on purpose -- we dont want any of the above functions
-  * to have any knowledge of this struct.
-  */
--static TimerList *PendingTimers;
-+TimerList *PendingTimers;
- static char *schedule_timer (TimerList *ntimer);
- 
- static char *current_exec_timer = empty_string;
diff --git a/net-p2p/teknap/files/patch-status.c b/net-p2p/teknap/files/patch-status.c
deleted file mode 100644
index 3f601fcc18f3..000000000000
--- a/net-p2p/teknap/files/patch-status.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/status.c.orig	Sun Jul 20 14:33:43 2003
-+++ source/status.c	Sun Jul 20 15:01:05 2003
-@@ -38,7 +38,7 @@
-  * Maximum number of "%" expressions in a status line format.  If you change
-  * this number, you must manually change the sprintf() in make_status 
-  */
--#define STATUS_FUNCTION(x) static Char * ## x (Window *window, int map, int key)
-+#define STATUS_FUNCTION(x) static Char * x (Window *window, int map, int key)
- #define MAX_FUNCTIONS 40
- #define MAX_STATUS_USER 19
- 
diff --git a/net-p2p/teknap/pkg-descr b/net-p2p/teknap/pkg-descr
deleted file mode 100644
index c0a32f871670..000000000000
--- a/net-p2p/teknap/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-TekNap is a console Napster client using curses/ncurses/termcap and
-pthreads if available. It has powerful scripting features based on
-BitchX/Epic scripting, support for both Napster and opennap servers,
-and a full-screen browse/search mode.
diff --git a/net-p2p/teknap/pkg-message b/net-p2p/teknap/pkg-message
deleted file mode 100644
index 567845bc4349..000000000000
--- a/net-p2p/teknap/pkg-message
+++ /dev/null
@@ -1 +0,0 @@
-Please read %%DOCSDIR%%/README
diff --git a/net-p2p/vhcp/Makefile b/net-p2p/vhcp/Makefile
deleted file mode 100644
index 56e6c7d9196b..000000000000
--- a/net-p2p/vhcp/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# Created by: Maxim Ignatenko
-# $FreeBSD$
-
-PORTNAME=	vhcp
-PORTVERSION=	1.7g2
-CATEGORIES=	net-p2p www
-MASTER_SITES=	SF/${PORTNAME}/PHP%205.x/1.7g
-DISTNAME=	vhcp_v${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Verlihub control panel
-
-WRKSRC=	${WRKDIR}/${PORTNAME}
-
-USE_PHP=	mysql gd
-NO_BUILD=	YES
-WANT_PHP_WEB=	YES
-DEFAULT_PHP_VER=	5
-VHCPDIR?=	www/vhcp
-SUB_FILES=	pkg-message
-SUB_LIST+=	VHCPDIR=${VHCPDIR}
-PLIST=	${WRKDIR}/pkg-plist
-
-NO_STAGE=	yes
-pre-install:
-	@if [ -f ${WRKSRC}/config.php ]; then \
-	   	${MV} ${WRKSRC}/config.php ${WRKSRC}/config.php.dist ; fi
-	@cd ${WRKSRC} && \
-		${ECHO_CMD} "@unexec if cmp -s %D/${VHCPDIR}/config.php.dist \
-		%D/${VHCPDIR}/config.php; then \
-		${RM} -f %D/${VHCPDIR}/config.php; fi" > ${PLIST} && \
-		${FIND} -s * -type f | \
-		${SED} -e 's|^|${VHCPDIR}/|g' >> ${PLIST} && \
-		${ECHO_CMD} "@exec if [ ! -f %D/${VHCPDIR}/config.php ] ; then \
-		${CP} -p %D/${VHCPDIR}/config.php.dist \
-		%D/${VHCPDIR}/config.php; fi" >> ${PLIST} && \
-		${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm ${VHCPDIR}/|g' >> ${PLIST} && \
-		${ECHO_CMD} @dirrm ${VHCPDIR} >> ${PLIST}
-
-do-install:
-	-@${MKDIR} ${PREFIX}/${VHCPDIR}
-	@${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${VHCPDIR}
-	@${CHMOD} 755 ${PREFIX}/${VHCPDIR}
-	@${CP} -R ${WRKSRC}/ ${PREFIX}/${VHCPDIR}
-	if [ ! -f ${PREFIX}/${VHCPDIR}/config.php ]; then \
-		${CP} ${PREFIX}/${VHCPDIR}/config.php.dist \
-		${PREFIX}/${VHCPDIR}/config.php ; \
-	fi
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/net-p2p/vhcp/distinfo b/net-p2p/vhcp/distinfo
deleted file mode 100644
index 45c9b9fb7906..000000000000
--- a/net-p2p/vhcp/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (vhcp_v1.7g2.tar.gz) = 2e366a428009952b8d7b4358a143d5125a35258ae3a8007dd4b00309380b6462
-SIZE (vhcp_v1.7g2.tar.gz) = 235611
diff --git a/net-p2p/vhcp/files/pkg-message.in b/net-p2p/vhcp/files/pkg-message.in
deleted file mode 100644
index ec8f6c418fff..000000000000
--- a/net-p2p/vhcp/files/pkg-message.in
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Don't forget to edit %%PREFIX%%/%%VHCPDIR%%/config.php to point to your
-existing verlihub config database
-
diff --git a/net-p2p/vhcp/pkg-descr b/net-p2p/vhcp/pkg-descr
deleted file mode 100644
index b5bfe2f74326..000000000000
--- a/net-p2p/vhcp/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Verlihub Contro Panel is a tool for the administration of your hubsoft
-VerliHub 0.9.7 (or higher). It's written in PHP so you can use it on 
-every OS that runs Apache Web Server with PHP support.
-
-WWW: http://vhcp.verlihub-project.org/viewforum.php?f=32
diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile
deleted file mode 100644
index a38ee0bacf79..000000000000
--- a/net/DarwinStreamingServer/Makefile
+++ /dev/null
@@ -1,143 +0,0 @@
-# Created by: steve@stevenwills.com
-# $FreeBSD$
-
-PORTNAME=	DarwinStreamingServer
-PORTVERSION=	6.0.3
-PORTREVISION=	0
-CATEGORIES=	net
-MASTER_SITES=	http://dss.macosforge.org/downloads/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=     nork
-DISTNAME=	DarwinStreamingSrvr${PORTVERSION}-Source
-EXTRACT_SUFX=	.tar
-
-PATCH_SITES=	http://www.abrahamsson.com/ \
-		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=nork
-PATCHFILES=	dss-6.0.3.patch
-PATCH_DIST_STRIP=-p1
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Darwin Streaming Server, a MP3, MPEG4, and QuickTime streaming server
-
-RUN_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
-
-NOT_FOR_ARCHS=	ia64 powerpc sparc64
-
-USES=		perl5
-USE_RC_SUBR=	streamingadminserver darwin_streaming_server
-SUB_LIST+=	PERL=${PERL}
-
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-MAKE_ENV+=	MAKE="${MAKE}"				\
-		DATADIR="${DATADIR}"			\
-		PTHREAD_LIBS="${PTHREAD_LIBS}"		\
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-post-extract:
-	@${RM} -rf \
-		${WRKSRC}/dssPackageMetaData \
-		${WRKSRC}/pubPackageMetaData \
-		${WRKSRC}/qtssPackageMetaData \
-		${WRKSRC}/WebAdmin/NetSSLeay
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,/var/streaming/logs,/var/log/streaming,' \
-		${WRKSRC}/Install							\
-		${WRKSRC}/defaultPaths.h						\
-		${WRKSRC}/Documentation/readme.txt					\
-		${WRKSRC}/streamingserver.xml-POSIX					\
-		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
-		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf
-	@${REINPLACE_CMD} -e 's,/var/streaming/playlists,/var/spool/streaming.playlists,' \
-		${WRKSRC}/Install							\
-		${WRKSRC}/Documentation/readme.txt					\
-		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
-		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf
-
-	@${REINPLACE_CMD} -e 's,/usr/local/movies,${DATADIR}/movies,' \
-		${WRKSRC}/Install							\
-		${WRKSRC}/defaultPaths.h						\
-		${WRKSRC}/Documentation/readme.txt					\
-		${WRKSRC}/streamingserver.xml-POSIX					\
-		${WRKSRC}/WebAdmin/WebAdminHtml/adminprotocol-lib.pl
-	@${REINPLACE_CMD} -e 's,/usr/local/sbin/StreamingServerModules,/usr/local/libexec/StreamingServerModules,' \
-		${WRKSRC}/Install							\
-		${WRKSRC}/defaultPaths.h						\
-		${WRKSRC}/Documentation/readme.txt					\
-		${WRKSRC}/streamingserver.xml-POSIX
-	@${REINPLACE_CMD} -e 's,/etc/streaming,/usr/local/etc/streaming,' \
-		${WRKSRC}/Install							\
-		${WRKSRC}/qtaccess							\
-		${WRKSRC}/defaultPaths.h						\
-		${WRKSRC}/Documentation/readme.txt					\
-		${WRKSRC}/streamingserver.xml-POSIX					\
-		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
-		${WRKSRC}/StreamingProxy.tproj/StreamingProxy.html			\
-		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf
-	@${REINPLACE_CMD} -e 's,/var/streaming,${DATADIR},' \
-		${WRKSRC}/Install							\
-		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
-		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf
-
-	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' \
-		${WRKSRC}/Install							\
-		${WRKSRC}/qtaccess							\
-		${WRKSRC}/defaultPaths.h						\
-		${WRKSRC}/Documentation/readme.txt					\
-		${WRKSRC}/streamingserver.xml-POSIX					\
-		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
-		${WRKSRC}/StreamingProxy.tproj/StreamingProxy.html			\
-		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf			\
-		${WRKSRC}/WebAdmin/WebAdminHtml/adminprotocol-lib.pl
-
-	@${REINPLACE_CMD} -e '/-O[23]/d' \
-		${WRKSRC}/Makefile.POSIX						\
-		${WRKSRC}/QTFileLib/Makefile.POSIX					\
-		${WRKSRC}/qtpasswd.tproj/Makefile.POSIX					\
-		${WRKSRC}/MP3Broadcaster/Makefile.POSIX					\
-		${WRKSRC}/HTTPUtilitiesLib/Makefile.POSIX				\
-		${WRKSRC}/StreamingLoadTool/Makefile.POSIX				\
-		${WRKSRC}/CommonUtilitiesLib/Makefile.POSIX				\
-		${WRKSRC}/StreamingProxy.tproj/Makefile.POSIX				\
-		${WRKSRC}/PlaylistBroadcaster.tproj/Makefile.POSIX			\
-		${WRKSRC}/QTFileTools/QTRTPGen.tproj/Makefile.POSIX			\
-		${WRKSRC}/QTFileTools/QTSDPGen.tproj/Makefile.POSIX			\
-		${WRKSRC}/QTFileTools/QTFileInfo.tproj/Makefile.POSIX			\
-		${WRKSRC}/QTFileTools/QTFileTest.tproj/Makefile.POSIX			\
-		${WRKSRC}/APIModules/QTSSRefMovieModule/Makefile.POSIX			\
-		${WRKSRC}/QTFileTools/QTTrackInfo.tproj/Makefile.POSIX			\
-		${WRKSRC}/QTFileTools/QTBroadcaster.tproj/Makefile.POSIX		\
-		${WRKSRC}/QTFileTools/QTRTPFileTest.tproj/Makefile.POSIX		\
-		${WRKSRC}/QTFileTools/QTSampleLister.tproj/Makefile.POSIX		\
-		${WRKSRC}/APIModules/QTSSHomeDirectoryModule/Makefile.POSIX		\
-		${WRKSRC}/APIModules/QTSSRawFileModule.bproj/Makefile.POSIX		\
-		${WRKSRC}/APIModules/QTSSSpamDefenseModule.bproj/Makefile.POSIX		\
-		${WRKSRC}/APIModules/QTSSDemoRedirectModule.bproj/Makefile.POSIX	\
-		${WRKSRC}/APIModules/QTSSDemoAuthorizationModule.bproj/Makefile.POSIX
-
-do-build:
-	# XXX: Quick hack after ddss-6.0.3.patch is patched.
-	# I don't know why these files are removed.
-	# ${LN} -s RTSPRequest3GPP.cpp.orig ${WRKSRC}/Server.tproj/RTSPRequest3GPP.cpp
-	# ${LN} -s RTPStream.h.orig ${WRKSRC}/Server.tproj/RTPStream.h
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} sh -x ./Buildit)
-
-post-build:
-	@${CP} ${.CURDIR}/pkg-message ${WRKDIR}/pkg-message
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKDIR}/pkg-message
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} /bin/sh -x ./DSS_MakeRoot -f ${OPSYS})
-
-pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
-
-do-install:
-	@(cd ${WRKSRC}/${OPSYS}; ${SETENV} ${MAKE_ENV} ./Install)
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/net/DarwinStreamingServer/distinfo b/net/DarwinStreamingServer/distinfo
deleted file mode 100644
index 90fbc75b18df..000000000000
--- a/net/DarwinStreamingServer/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (DarwinStreamingSrvr6.0.3-Source.tar) = 7bf75ced3f603f55c6f7601bfecd9f26393ea98be821d24169f2091843706522
-SIZE (DarwinStreamingSrvr6.0.3-Source.tar) = 32593920
-SHA256 (dss-6.0.3.patch) = 13741e14f704d3b0db00100c9213ff0bec104403622905e92f370d846bf8f2ea
-SIZE (dss-6.0.3.patch) = 15014
diff --git a/net/DarwinStreamingServer/files/darwin_streaming_server.in b/net/DarwinStreamingServer/files/darwin_streaming_server.in
deleted file mode 100644
index 42996a6a9f45..000000000000
--- a/net/DarwinStreamingServer/files/darwin_streaming_server.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: darwin_streaming_server
-# REQUIRE: streamingadminserver
-#
-darwin_streaming_server_enable=${darwin_streaming_server_enable-"NO"}
-
-. /etc/rc.subr
-
-name=darwin_streaming_server
-rcvar=darwin_streaming_server_enable
-command=%%PREFIX%%/sbin/DarwinStreamingServer
-
-load_rc_config ${name}
-
-case "$streamingadminserver_enable" in
-[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
-	darwin_streaming_server_enable="NO"
-	;;
-esac
-
-pidfile=/var/run/DarwinStreamingServer.pid
-
-run_rc_command "$1"
diff --git a/net/DarwinStreamingServer/files/patch-Buildit b/net/DarwinStreamingServer/files/patch-Buildit
deleted file mode 100644
index 4e5960a8c1ce..000000000000
--- a/net/DarwinStreamingServer/files/patch-Buildit
+++ /dev/null
@@ -1,92 +0,0 @@
---- Buildit.orig	2008-03-26 09:42:48.000000000 +0900
-+++ Buildit	2008-06-01 04:24:51.000000000 +0900
-@@ -9,19 +9,19 @@
- fi
- 
- SHOW_HELP=0
--if [ "$1" = "-v" ] ; then
-+if [ x"$1" = x"-v" ] ; then
-    SHOW_HELP=1
- fi
- 
--if [ "$1" = "-h" ] ; then
-+if [ x"$1" = x"-h" ] ; then
-    SHOW_HELP=1
- fi
- 
--if [ "$1" = "?" ] ; then
-+if [ x"$1" = x"?" ] ; then
-    SHOW_HELP=1
- fi
- 
--if [ "$1" = "help" ] ; then
-+if [ x"$1" = x"help" ] ; then
-    SHOW_HELP=1
- fi
- 
-@@ -42,7 +42,7 @@
- fi
- 
- 
--if [ "$1" = "install" ] ; then
-+if [ x"$1" = x"install" ] ; then
-     if [ $PLATFORM = dss ] ; then
-       echo "OS X Darwin Streaming Server"
-       ./BuildOSXInstallerPkg $2 $3
-@@ -128,20 +128,20 @@
- 		fi
- 		;;
- 
--	FreeBSD.i386)
-+	FreeBSD.*)
-         echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
--		CPLUS=gcc
--		CCOMP=gcc
--		LINKER="gcc"
-- 		MAKE=make
-+		CPLUS=${CXX}
-+		CCOMP=${CC}
-+		LINKER="${CXX}"
-+ 		MAKE=${MAKE}
-  		
--		COMPILER_FLAGS=
--        INCLUDE_FLAG="-include"
-+		COMPILER_FLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -fPIC -funsigned-char"
-+		INCLUDE_FLAG="-include"
- 		
--		CORE_LINK_LIBS="-pthread -lm -lcrypt"
-+		CORE_LINK_LIBS="${PTHREAD_LIBS} -lm -lcrypt"
- 
- 		SHARED=-shared
--		MODULE_LIBS="-lgcc -lstdc++"
-+		MODULE_LIBS=""
- 		;;
- 	
- #	SunOS.sun4m | \
-@@ -241,7 +241,7 @@
- 		;;
- esac
- 
--if [ "$*" = "install" ] ; then
-+if [ x"$1" = x"install" ] ; then
- 
-         if [ `uname` != "SunOS" ]; then
-                 USERID=`id -u`
-@@ -329,7 +329,7 @@
- 	echo Building QTFileLib internal for $PLAT with $CPLUS
- 	cd ../QTFileLib/
- 	
--	if [ "$*" = "clean" ] ; then
-+	if [ x"$*" = x"clean" ] ; then
- 		$MAKE -f Makefile.POSIX $*
- 	else
- 		$MAKE -f Makefile.POSIX all $*
-@@ -421,7 +421,7 @@
- 			$MAKE -f Makefile.POSIX $*
- 	fi
- 
--	if [ "$*" = "install" ] ; then
-+	if [ x"$1" = x"install" ] ; then
- 		cd ..
- 		pwdi
- 		echo
diff --git a/net/DarwinStreamingServer/files/patch-DSS_MakeRoot b/net/DarwinStreamingServer/files/patch-DSS_MakeRoot
deleted file mode 100644
index b0976076699d..000000000000
--- a/net/DarwinStreamingServer/files/patch-DSS_MakeRoot
+++ /dev/null
@@ -1,15 +0,0 @@
---- DSS_MakeRoot.orig	2007-11-16 14:18:07.000000000 +0900
-+++ DSS_MakeRoot	2008-06-01 14:45:36.000000000 +0900
-@@ -5,10 +5,10 @@
- # source release
- 
- DSS=0
--if [ $1 = "-f" ]; then
-+if [ x"$1" = x"-f" ]; then
- 	FLATTEN=1
- 	INSTALLROOT=$2
--	if [ $3 = "dss" ]; then
-+	if [ x"$3" = x"dss" ]; then
- 	    DSS=1
- 	fi
- else
diff --git a/net/DarwinStreamingServer/files/patch-Install b/net/DarwinStreamingServer/files/patch-Install
deleted file mode 100644
index fbd6fcea80bb..000000000000
--- a/net/DarwinStreamingServer/files/patch-Install
+++ /dev/null
@@ -1,238 +0,0 @@
---- Install.orig	2008-03-26 09:42:51.000000000 +0900
-+++ Install	2008-06-01 18:02:09.000000000 +0900
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- # Install script for the Darwin Streaming Server
- # source release
-@@ -16,6 +16,7 @@
- 
- if [ $USERID = 0 ]; then
- 
-+if false; then
- 	echo Checking for and Killing currently running Darwin Streaming Server
- 	if [ `uname` = "FreeBSD" ]; then
- 		ps -ax | awk '/DarwinStreamingServer/ {print $1}' | xargs kill -9  
-@@ -113,6 +114,7 @@
- 	fi
- 
- 	echo
-+fi
- 
- ## CHANGE PERL PATH IN streamingadminserver.pl AND parse_xml.cgi ##
- 
-@@ -209,29 +211,29 @@
-     fi              
- 
- 	echo copying "DarwinStreamingServer" to "/usr/local/sbin/DarwinStreamingServer"
--	cp -f DarwinStreamingServer /usr/local/sbin/
-+	${BSD_INSTALL_PROGRAM} DarwinStreamingServer /usr/local/sbin/
- 	
- 	
- 	echo copying "PlaylistBroadcaster" to "/usr/local/bin/PlaylistBroadcaster"
--	cp -f PlaylistBroadcaster /usr/local/bin/
-+	${BSD_INSTALL_PROGRAM} PlaylistBroadcaster /usr/local/bin/
- 	
- 	echo copying "MP3Broadcaster" to "/usr/local/bin/MP3Broadcaster"
--	cp -f MP3Broadcaster /usr/local/bin/
-+	${BSD_INSTALL_PROGRAM} MP3Broadcaster /usr/local/bin/
- 	
- 	echo copying "qtpasswd" to "/usr/local/bin/qtpasswd"
--	cp -f qtpasswd /usr/local/bin/
-+	${BSD_INSTALL_PROGRAM} qtpasswd /usr/local/bin/
- 
- 	# For now, do not copy modules as there are no supported dynamic modules
- 	# echo copying modules to "/usr/local/sbin/StreamingServerModules"
--	if [ ! -d /usr/local/sbin/StreamingServerModules ]; then
--		echo creating "/usr/local/sbin/StreamingServerModules" directory
--		mkdir /usr/local/sbin/StreamingServerModules
-+	if [ ! -d /usr/local/libexec/StreamingServerModules ]; then
-+		echo creating "/usr/local/libexec/StreamingServerModules" directory
-+		mkdir /usr/local/libexec/StreamingServerModules
- 	fi
--	cp -f StreamingServerModules/* /usr/local/sbin/StreamingServerModules/
-+	${BSD_INSTALL_PROGRAM} StreamingServerModules/* /usr/local/libexec/StreamingServerModules/
- 
--	if [ -e /usr/local/sbin/StreamingServerModules/QTSSHomeDirectoryModule ]; then
-+	if [ -e /usr/local/libexec/StreamingServerModules/QTSSHomeDirectoryModule ]; then
- 		echo copying "createuserstreamingdir" to "/usr/local/bin/createuserstreamingdir"
--		cp -f createuserstreamingdir $INSTALLROOT/usr/local/bin/
-+		${BSD_INSTALL_PROGRAM} createuserstreamingdir /usr/local/bin/
- 	fi
- 	
- 	if [ ! -d /etc/streaming ]; then
-@@ -239,32 +241,41 @@
- 		mkdir -p /etc/streaming
- 	fi
- 	
-+	echo copying "streamingserver.xml" to "/etc/streaming/streamingserver.xml-dist"
-+	${BSD_INSTALL_DATA} streamingserver.xml /etc/streaming/streamingserver.xml-dist
- 	if [ ! -e /etc/streaming/streamingserver.xml ]; then
-+		echo;echo copying "streamingserver.xml" to "/etc/streaming/streamingserver.xml"
-+		${BSD_INSTALL_DATA} streamingserver.xml /etc/streaming/streamingserver.xml
-+if false; then
- 		/usr/local/sbin/DarwinStreamingServer -x
-+fi
- 	fi
- 	
- 	chmod 600 /etc/streaming/streamingserver.xml
- 	chown qtss /etc/streaming/streamingserver.xml
- 	
--	echo;echo copying "relayconfig.xml-Sample" to "/etc/streaming/relayconfig.xml-Sample"
--	cp -f relayconfig.xml-Sample /etc/streaming/relayconfig.xml-Sample
--	chmod 600 /etc/streaming/relayconfig.xml-Sample
--	if [ -e /etc/streaming/relayconfig.xml ]; then
-+	echo;echo copying "relayconfig.xml-Sample" to "/etc/streaming/relayconfig.xml-dist"
-+	${BSD_INSTALL_DATA} relayconfig.xml-Sample /etc/streaming/relayconfig.xml-dist
-+	chmod 600 /etc/streaming/relayconfig.xml-dist
-+	if [ ! -e /etc/streaming/relayconfig.xml ]; then
-+		echo;echo copying "relayconfig.xml-Sample" to "/etc/streaming/relayconfig.xml"
-+		${BSD_INSTALL_DATA} relayconfig.xml-Sample /etc/streaming/relayconfig.xml
- 		chown qtss /etc/streaming/relayconfig.xml
-+		chmod 600 /etc/streaming/relayconfig.xml
- 	fi
- 	
--	echo;echo copying "qtusers" to "/etc/streaming/qtusers"
--	cp -f qtusers /etc/streaming/qtusers
--	chmod 600 /etc/streaming/qtusers
--	chown qtss /etc/streaming/qtusers
--
--	echo;echo copying "qtgroups" to "/etc/streaming/qtgroups"
--	cp -f qtgroups /etc/streaming/qtgroups
--	chmod 600 /etc/streaming/qtgroups
--	chown qtss /etc/streaming/qtgroups
-+	echo;echo copying "qtusers" to "/etc/streaming/qtusers-dist"
-+	${BSD_INSTALL_DATA} qtusers /etc/streaming/qtusers-dist
-+	chmod 600 /etc/streaming/qtusers-dist
-+	chown qtss /etc/streaming/qtusers-dist
-+
-+	echo;echo copying "qtgroups" to "/etc/streaming/qtgroups-dist"
-+	${BSD_INSTALL_DATA} qtgroups /etc/streaming/qtgroups-dist
-+	chmod 600 /etc/streaming/qtgroups-dist
-+	chown qtss /etc/streaming/qtgroups-dist
- 
- 	#echo;echo copying "streamingadminserver.pem" to "/etc/streaming/streamingadminserver.pem"
--	#cp -f streamingadminserver.pem /etc/streaming/streamingadminserver.pem
-+	#${BSD_INSTALL_DATA} streamingadminserver.pem /etc/streaming/streamingadminserver.pem
- 	#chmod 400 /etc/streaming/streamingadminserver.pem
- 
- 	if [ ! -d /var/streaming ]; then
-@@ -273,10 +284,10 @@
- 	fi
- 	
- 	echo copying "readme.txt" to "/var/streaming/readme.txt"
--	cp -f readme.txt /var/streaming/readme.txt
-+	${BSD_INSTALL_DATA} readme.txt /var/streaming/readme.txt
- 	
- 	echo copying "3rdPartyAcknowledgements.rtf" to "/var/streaming/3rdPartyAcknowledgements.rtf"
--	cp -f 3rdPartyAcknowledgements.rtf /var/streaming/3rdPartyAcknowledgements.rtf
-+	${BSD_INSTALL_DATA} 3rdPartyAcknowledgements.rtf /var/streaming/3rdPartyAcknowledgements.rtf
- 	
- 	if [ ! -d /var/streaming/logs ]; then
- 		echo creating "/var/streaming/logs" directory
-@@ -292,70 +303,81 @@
- 		echo creating "/var/streaming/playlists" directory
- 		mkdir -p /var/streaming/playlists
- 	fi
-+	chown -Rh qtss:qtss /var/streaming/playlists
- 	chmod 770 /var/streaming/playlists
- 	chmod 775 /usr/local/movies
- 	
-     echo copying "sample_100kbit.mov" into "/usr/local/movies/sample_100kbit.mov"
--    cp -f sample_100kbit.mov /usr/local/movies/
-+    ${BSD_INSTALL_DATA} sample_100kbit.mov /usr/local/movies/
- 
-     echo copying "sample_300kbit.mov" into "/usr/local/movies/sample_300kbit.mov"
--    cp -f sample_300kbit.mov /usr/local/movies/
-+    ${BSD_INSTALL_DATA} sample_300kbit.mov /usr/local/movies/
- 
-     echo copying "sample_100kbit.mp4" into "/usr/local/movies/sample_100kbit.mp4"
--    cp -f sample_100kbit.mp4 /usr/local/movies/
-+    ${BSD_INSTALL_DATA} sample_100kbit.mp4 /usr/local/movies/
- 
-     echo copying "sample_300kbit.mp4" into "/usr/local/movies/sample_300kbit.mp4"
--    cp -f sample_300kbit.mp4 /usr/local/movies/
-+    ${BSD_INSTALL_DATA} sample_300kbit.mp4 /usr/local/movies/
- 
-     echo copying "sample.mp3" into "/usr/local/movies/sample.mp3"
--    cp -f sample.mp3 /usr/local/movies/
-+    ${BSD_INSTALL_DATA} sample.mp3 /usr/local/movies/
- 
-     echo copying "sample_50kbit.3gp" into "/usr/local/movies/sample_50kbit.3gp"
--    cp -f sample_50kbit.3gp /usr/local/movies/
-+    ${BSD_INSTALL_DATA} sample_50kbit.3gp /usr/local/movies/
- 
-     echo copying "sample_h264_100kbit.mp4" into "/usr/local/movies/sample_h264_100kbit.mp4"
--    cp -f sample_h264_100kbit.mp4 /usr/local/movies/
-+    ${BSD_INSTALL_DATA} sample_h264_100kbit.mp4 /usr/local/movies/
- 
-     echo copying "sample_h264_300kbit.mp4" into "/usr/local/movies/sample_h264_300kbit.mp4"
--    cp -f sample_h264_300kbit.mp4 /usr/local/movies/
-+    ${BSD_INSTALL_DATA} sample_h264_300kbit.mp4 /usr/local/movies/
- 
-     echo copying "sample_h264_1mbit.mp4" into "/usr/local/movies/sample_h264_1mbit.mp4"
--    cp -f sample_h264_1mbit.mp4 /usr/local/movies/
-+    ${BSD_INSTALL_DATA} sample_h264_1mbit.mp4 /usr/local/movies/
- 
- if [ -e StreamingLoadTool ]; then
- 	echo copying "StreamingLoadTool" to "/usr/local/bin/StreamingLoadTool"
--	cp -f StreamingLoadTool /usr/local/bin/
-+	${BSD_INSTALL_PROGRAM} StreamingLoadTool /usr/local/bin/
- 	
--	echo copying "streamingloadtool.conf" to "/etc/streaming/streamingloadtool.conf"
--	cp -f streamingloadtool.conf /etc/streaming/
-+	echo copying "streamingloadtool.conf" to "/etc/streaming/streamingloadtool.conf-dist"
-+	${BSD_INSTALL_DATA} streamingloadtool.conf /etc/streaming/streamingloadtool.conf-dist
-+
-+	if [ ! -e /etc/streaming/streamingloadtool.conf ]; then
-+		echo;echo copying "streamingloadtool.conf" to "/etc/streaming/streamingloadtool.conf"
-+		${BSD_INSTALL_DATA} streamingloadtool.conf /etc/streaming/streamingloadtool.conf
-+		chown qtss /etc/streaming/streamingloadtool.conf
-+		chmod 600 /etc/streaming/streamingloadtool.conf
-+	fi
- fi
- 	
- 	#WebAdmin install
- 	echo copying "streamingadminserver.pl" into "/usr/local/sbin/streamingadminserver.pl"
--	cp -f streamingadminserver.pl /usr/local/sbin/streamingadminserver.pl
-+	${BSD_INSTALL_SCRIPT} streamingadminserver.pl /usr/local/sbin/streamingadminserver.pl
- 	
- 	if [ -d /var/streaming/AdminHtml/ ]; then
- 	    echo removing old version of html from "/var/streaming/AdminHtml"
- 	    rm -r -f /var/streaming/AdminHtml/*
- 	fi    
- 	
--	if [ ! -d /var/streaming/ ]; then
-+	if [ ! -d /var/streaming/AdminHtml ]; then
- 		echo creating "/var/streaming/AdminHtml" directory
- 		mkdir -p /var/streaming/AdminHtml
- 	fi
- 	echo copying Admin HTML to "/var/streaming/AdminHtml" directory
--	cp -f -r AdminHtml /var/streaming/
-+	pax -rwpe AdminHtml /var/streaming/
- 	
- 
- 	chown -R -f qtss /var/streaming/
- 	chown -R -f qtss /etc/streaming/
- 	chown -R -f qtss /usr/local/movies/
- 
-+if false; then
- 	echo;echo "Launching streamingadminserver.pl"
- 	/usr/local/sbin/streamingadminserver.pl
-+fi
- 	
- 	echo;echo Installation Complete
- 
-+if false; then
- 	# Setup for DSS
- 	# Prompts for a username and password
- 	# that can be used to administer the server
-@@ -418,6 +440,7 @@
- 	chown -R -f qtss /etc/streaming/
- 	
- 	echo Setup Complete!
-+fi
- 	
- else
- 
diff --git a/net/DarwinStreamingServer/files/patch-MP3Broadcaster__BroadcasterMain.cpp b/net/DarwinStreamingServer/files/patch-MP3Broadcaster__BroadcasterMain.cpp
deleted file mode 100644
index 8bd95bf27ad5..000000000000
--- a/net/DarwinStreamingServer/files/patch-MP3Broadcaster__BroadcasterMain.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- MP3Broadcaster/BroadcasterMain.cpp.orig	2008-05-06 08:28:57.000000000 +0900
-+++ MP3Broadcaster/BroadcasterMain.cpp	2008-06-01 18:05:51.000000000 +0900
-@@ -85,7 +85,7 @@
-     char* config = NULL;
-     char* playList = NULL;
-     char* workingDir = NULL;
--    char ch;
-+    int ch;
-     bool preflight = false;
-     bool checkMP3s = false;
-     char*   errorlog = NULL;
-@@ -112,7 +112,7 @@
-         ::exit(0);
-     }
- 
--    while ( (ch = getopt(argc,argv, "vdixXa:p:c:l:e:w:")) != EOF ) // opt: means requires option
-+    while ( (ch = getopt(argc,argv, "vdixXa:p:c:l:e:w:")) != -1 ) // opt: means requires option
-     {
-         switch(ch)
-         {
-@@ -216,7 +216,7 @@
- 
- struct sigaction act;
-     
--#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) || defined(__linuxppc__)
-+#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) || defined(__linuxppc__) || defined(__amd64__)
-     sigemptyset(&act.sa_mask);
-     act.sa_flags = 0;
-     act.sa_handler = (void(*)(int))&SignalEventHandler;
diff --git a/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj__PlaylistBroadcaster.cpp b/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj__PlaylistBroadcaster.cpp
deleted file mode 100644
index 9f119dac5ad4..000000000000
--- a/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj__PlaylistBroadcaster.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp.orig	2008-05-06 08:29:00.000000000 +0900
-+++ PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp	2008-06-01 18:07:58.000000000 +0900
-@@ -231,7 +231,7 @@
- #ifdef __Win32__
-     while ((anOption = getopt(argc, argv, "vhdcpbDtai:fe:" )) != EOF)
- #else
--    while ((anOption = getopt(argc, argv, "vhdcpbDls:tai:fe:" )) != EOF)
-+    while ((anOption = getopt(argc, argv, "vhdcpbDls:tai:fe:" )) != -1)
- #endif
-     {
-         
-@@ -2082,7 +2082,7 @@
- 
- struct sigaction act;
-     
--#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__powerpc__) || defined (__sgi_cc__) || defined(__osf__) || defined(__hpux__)
-+#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__powerpc__) || defined (__sgi_cc__) || defined(__osf__) || defined(__hpux__) || defined(__amd64__)
- 	sigemptyset(&act.sa_mask);
- 	act.sa_flags = 0;
-     act.sa_handler = (void(*)(int))&SignalEventHandler;
diff --git a/net/DarwinStreamingServer/files/patch-Server.tproj__main.cpp b/net/DarwinStreamingServer/files/patch-Server.tproj__main.cpp
deleted file mode 100644
index 92f1739f5f12..000000000000
--- a/net/DarwinStreamingServer/files/patch-Server.tproj__main.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- Server.tproj/main.cpp.orig	2008-05-06 08:28:59.000000000 +0900
-+++ Server.tproj/main.cpp	2008-06-01 18:09:20.000000000 +0900
-@@ -216,7 +216,7 @@
-     //(void) ::signal(SIGPIPE, SIG_IGN);
-     struct sigaction act;
-     
--#if defined(sun) || defined(i386) || defined (__MacOSX__) || defined(__powerpc__) || defined (__osf__) || defined (__sgi_cc__) || defined (__hpux__)
-+#if defined(sun) || defined(i386) || defined (__MacOSX__) || defined(__powerpc__) || defined (__osf__) || defined (__sgi_cc__) || defined (__hpux__) || defined(__amd64__)
-     sigemptyset(&act.sa_mask);
-     act.sa_flags = 0;
-     act.sa_handler = (void(*)(int))&sigcatcher;
-@@ -306,7 +306,7 @@
- 
-     char* theConfigFilePath = sDefaultConfigFilePath;
-     char* theXMLFilePath = sDefaultXMLFilePath;
--    while ((ch = getopt(argc,argv, "vdfxp:DZ:c:o:S:Ih")) != EOF) // opt: means requires option arg
-+    while ((ch = getopt(argc,argv, "vdfxp:DZ:c:o:S:Ih")) != -1) // opt: means requires option arg
-     {
-         switch(ch)
-         {
diff --git a/net/DarwinStreamingServer/files/patch-StreamingLoadTool-StreamingLoadTool.cpp b/net/DarwinStreamingServer/files/patch-StreamingLoadTool-StreamingLoadTool.cpp
deleted file mode 100644
index 205795fc6a33..000000000000
--- a/net/DarwinStreamingServer/files/patch-StreamingLoadTool-StreamingLoadTool.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- StreamingLoadTool/StreamingLoadTool.cpp.orig	2008-06-01 18:20:48.000000000 +0900
-+++ StreamingLoadTool/StreamingLoadTool.cpp	2008-06-01 18:31:35.000000000 +0900
-@@ -135,7 +135,7 @@
- #ifndef __Win32__
- 	struct sigaction act;
- 	
--#if defined(sun) || defined(i386) || defined (__MacOSX__) || defined(__powerpc__) || defined (__osf__) || defined (__sgi_cc__) || defined (__hpux__)
-+#if defined(sun) || defined(i386) || defined (__MacOSX__) || defined(__powerpc__) || defined (__osf__) || defined (__sgi_cc__) || defined (__hpux__) || defined(__amd64__)
-     sigemptyset(&act.sa_mask);
-     act.sa_flags = 0;
-     act.sa_handler = (void(*)(int))&sigcatcher;
diff --git a/net/DarwinStreamingServer/files/patch-StreamingProxy.tproj-proxy.c b/net/DarwinStreamingServer/files/patch-StreamingProxy.tproj-proxy.c
deleted file mode 100644
index ea7618d760af..000000000000
--- a/net/DarwinStreamingServer/files/patch-StreamingProxy.tproj-proxy.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- StreamingProxy.tproj/proxy.c.orig	2008-05-06 08:28:57.000000000 +0900
-+++ StreamingProxy.tproj/proxy.c	2008-06-01 18:10:57.000000000 +0900
-@@ -204,7 +204,7 @@
- {
-     int i, j;
-     int     numOptions = 0; // num command line options spec'd
--    signed char ch;
-+    int ch;
-     int listening_port = 554, user_listener = false;
-     time_t time_zero, now, last;
-     time_t  usnow, uslast;
diff --git a/net/DarwinStreamingServer/files/patch-WebAdmin__src__streamingadminserver.pl b/net/DarwinStreamingServer/files/patch-WebAdmin__src__streamingadminserver.pl
deleted file mode 100644
index 2d1c9206bbb5..000000000000
--- a/net/DarwinStreamingServer/files/patch-WebAdmin__src__streamingadminserver.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- WebAdmin/src/streamingadminserver.pl.orig	2008-05-06 08:28:57.000000000 +0900
-+++ WebAdmin/src/streamingadminserver.pl	2008-06-01 15:51:14.000000000 +0900
-@@ -255,7 +255,7 @@
- 	  "gbrowse", "0",
- 	  "ssl", "0",
- 	  "crtfile", "/etc/streaming/streamingadminserver.pem",
--	  "keyfile", "/etc/streaming/streamingadminserver.pem",
-+	  "keyfile", "/etc/streaming/streamingadminserver.key",
- 	  #"keypasswordfile", "",
- 	  "qtssQTPasswd", "/usr/local/bin/qtpasswd",
- 	  "qtssPlaylistBroadcaster", "/usr/local/bin/PlaylistBroadcaster",
diff --git a/net/DarwinStreamingServer/files/patch-qtpasswd.tproj-QTSSPasswd.cpp b/net/DarwinStreamingServer/files/patch-qtpasswd.tproj-QTSSPasswd.cpp
deleted file mode 100644
index 37139e734bb3..000000000000
--- a/net/DarwinStreamingServer/files/patch-qtpasswd.tproj-QTSSPasswd.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtpasswd.tproj/QTSSPasswd.cpp.orig	2008-05-06 08:28:58.000000000 +0900
-+++ qtpasswd.tproj/QTSSPasswd.cpp	2008-06-01 18:11:56.000000000 +0900
-@@ -723,7 +723,7 @@
-     extern int optind;
- 
- 	/* Read command line arguments */
--    while ((ch = getopt(argc, argv, "O:f:cg:r:p:P:A:D:C:R:dFhv?")) != EOF)
-+    while ((ch = getopt(argc, argv, "O:f:cg:r:p:P:A:D:C:R:dFhv?")) != -1)
-     {
-         switch(ch) 
-         {
diff --git a/net/DarwinStreamingServer/files/streamingadminserver.in b/net/DarwinStreamingServer/files/streamingadminserver.in
deleted file mode 100644
index dde54db34b9c..000000000000
--- a/net/DarwinStreamingServer/files/streamingadminserver.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: streamingadminserver
-# REQUIRE: login
-#
-streamingadminserver_enable=${streamingadminserver_enable-"NO"}
-
-. /etc/rc.subr
-
-name=streamingadminserver
-rcvar=streamingadminserver_enable
-command=%%PREFIX%%/sbin/${name}.pl
-command_interpreter=%%PERL%%
-
-load_rc_config ${name}
-
-pidfile=/var/run/streamingadminserver.pid
-
-run_rc_command "$1"
diff --git a/net/DarwinStreamingServer/pkg-descr b/net/DarwinStreamingServer/pkg-descr
deleted file mode 100644
index f2ab21094d17..000000000000
--- a/net/DarwinStreamingServer/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Darwin Streaming Server is server technology which allows you to send
-streaming QuickTime data to clients across the Internet using the industry
-standard RTP and RTSP protocols. It is based on the same code as Apple's
-QuickTime Streaming Server.
-
-WWW: http://dss.macosforge.org/
-WWW: http://developer.apple.com/darwin/projects/streaming/
diff --git a/net/DarwinStreamingServer/pkg-install b/net/DarwinStreamingServer/pkg-install
deleted file mode 100644
index 15a263f356c7..000000000000
--- a/net/DarwinStreamingServer/pkg-install
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-PATH=/bin:/usr/sbin
-
-case $2 in
-PRE-INSTALL)
-	USER=qtss
-	GROUP=${USER}
-	UID=554
-	GID=${UID}
-
-	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} -g ${GID}; 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."
-	else
-		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d /noexistant -c "Darwin Streaming Server"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-
-	;;
-
-esac
diff --git a/net/DarwinStreamingServer/pkg-message b/net/DarwinStreamingServer/pkg-message
deleted file mode 100644
index 11258cb264e0..000000000000
--- a/net/DarwinStreamingServer/pkg-message
+++ /dev/null
@@ -1,66 +0,0 @@
-===============================================================================
-
-		* IMPORTANT SETUP NOTICE * IMPORTANT SETUP NOTICE *
-
-o Set up DSS Administrator Username/Password.
-
-    $Username$ is an account for DSS Administration, e.g. admin, root, etc...
-
-    # qtpasswd -c $Username$
-    # echo admin: $Username$ > %%PREFIX%%/etc/streaming/qtgroups
-
-    NOTICE: qtpasswd will create new file with -c option.  Please
-            see also `qtpasswd -h'(mostly same as htpasswd).
-
-    NOTICE: qtgroups file will contain user(s) separated by white space
-            of group(s).
-
-o Set up SSL for DSS Administration Tool  (If you need)
-
-    Install your SSL Keys to %%PREFIX%%/etc/streaming/
-	streamingadminserver.key: SSL Private key
-	streamingadminserver.pem: SSL Public key
-
-o Boot DSS Administration Tool
-
-    # echo 'streamingadminserver_enable="YES"' >> /etc/rc.conf
-    # cd /; env - %%PREFIX%%/etc/rc.d/streamingadminserver.sh start
-
-    (*NOTE*)Darwin Streaming Server will run together.
-
-o Set up DSS Administration Tool with MSIE(Microsoft Internet Explorer)
-
-    Mozilla,  Netscape4/7 and Opera etc... are not useful.  DSS Administration
-    Tool requires MSIE(4.5 and later) J-Script feature.
-
-	http://YOUR.STREAMING.SERVER:1220/
-
-    If you need SSL, select 'Secure Administration (SSL)' in this setup.
-    After setup, you can access to
-
-	https://YOUR.STREAMING.SERVER:1240/
-
-===============================================================================
-
-Related directories
-
-  %%PREFIX%%/etc/streaming			- DSS Configuration Directory
-  %%PREFIX%%/share/DarwinStreamingServer/movies	- *Default* Movies Directory
-  /var/log/streaming				- DSS Streaming Log Directory
-  /var/spool/streaming.playlists		- DSS Playlists Directory
-
-===============================================================================
-
-  If you want to invoke only Darwin Streaming Server from start-up, put
-  following lines into /etc/rc.conf.
-
-    darwin_streaming_server_enable="YES"
-    darwin_streaming_server_flags=""
-
-  If you want to invoke DSS Administration Tool and Darwin Streaming
-  Server from start-up, do too.
-
-    streamingadminserver_enable="YES"
-    streamingadminserver_flags=""
-
-===============================================================================
diff --git a/net/DarwinStreamingServer/pkg-plist b/net/DarwinStreamingServer/pkg-plist
deleted file mode 100644
index 7fc0b6820bdc..000000000000
--- a/net/DarwinStreamingServer/pkg-plist
+++ /dev/null
@@ -1,168 +0,0 @@
-bin/qtpasswd
-bin/MP3Broadcaster
-bin/PlaylistBroadcaster
-bin/StreamingLoadTool
-sbin/DarwinStreamingServer
-sbin/streamingadminserver.pl
-libexec/StreamingServerModules/QTSSRefMovieModule
-libexec/StreamingServerModules/QTSSHomeDirectoryModule
-@exec   mkdir %D/%%DATADIR%%                 2>/dev/null || true
-@exec   mkdir %D/%%DATADIR%%/movies          2>/dev/null || true
-%%DATADIR%%/readme.txt
-%%DATADIR%%/3rdPartyAcknowledgements.rtf
-%%DATADIR%%/AdminHtml/MapUTF.pl
-%%DATADIR%%/AdminHtml/access_log.html
-%%DATADIR%%/AdminHtml/adminprotocol-lib.pl
-%%DATADIR%%/AdminHtml/broadcaster_lib.pl
-%%DATADIR%%/AdminHtml/broadcaster_settings.html
-%%DATADIR%%/AdminHtml/cgi-lib.pl
-%%DATADIR%%/AdminHtml/change_broadcast_password.html
-%%DATADIR%%/AdminHtml/change_mp3_password.html
-%%DATADIR%%/AdminHtml/change_password.html
-%%DATADIR%%/AdminHtml/change_password_redirect.html
-%%DATADIR%%/AdminHtml/confirm.html
-%%DATADIR%%/AdminHtml/connected.html
-%%DATADIR%%/AdminHtml/error_log.html
-%%DATADIR%%/AdminHtml/format.html
-%%DATADIR%%/AdminHtml/frameset.html
-%%DATADIR%%/AdminHtml/general_settings.html
-%%DATADIR%%/AdminHtml/html_en/genres
-%%DATADIR%%/AdminHtml/html_en/messages
-%%DATADIR%%/AdminHtml/images/LB_arrow_dn.gif
-%%DATADIR%%/AdminHtml/images/LB_arrow_up.gif
-%%DATADIR%%/AdminHtml/images/apple_logo.gif
-%%DATADIR%%/AdminHtml/images/arrow_down.gif
-%%DATADIR%%/AdminHtml/images/back.gif
-%%DATADIR%%/AdminHtml/images/blackpixel.gif
-%%DATADIR%%/AdminHtml/images/clearpixel.gif
-%%DATADIR%%/AdminHtml/images/dialog_alert.gif
-%%DATADIR%%/AdminHtml/images/dialog_bottom.gif
-%%DATADIR%%/AdminHtml/images/dialog_bottom_sm.gif
-%%DATADIR%%/AdminHtml/images/dialog_middle.gif
-%%DATADIR%%/AdminHtml/images/dialog_middle_sm.gif
-%%DATADIR%%/AdminHtml/images/dialog_qtss.gif
-%%DATADIR%%/AdminHtml/images/dialog_side.gif
-%%DATADIR%%/AdminHtml/images/dialog_top.gif
-%%DATADIR%%/AdminHtml/images/dialog_top_sm.gif
-%%DATADIR%%/AdminHtml/images/divider.gif
-%%DATADIR%%/AdminHtml/images/divider_vert.gif
-%%DATADIR%%/AdminHtml/images/dot.gif
-%%DATADIR%%/AdminHtml/images/folder.gif
-%%DATADIR%%/AdminHtml/images/greypixel.gif
-%%DATADIR%%/AdminHtml/images/headerpixel.gif
-%%DATADIR%%/AdminHtml/images/help.gif
-%%DATADIR%%/AdminHtml/images/highlight.gif
-%%DATADIR%%/AdminHtml/images/horz_line.gif
-%%DATADIR%%/AdminHtml/images/icon_alert.gif
-%%DATADIR%%/AdminHtml/images/icon_doc.gif
-%%DATADIR%%/AdminHtml/images/icon_error.gif
-%%DATADIR%%/AdminHtml/images/icon_folder.gif
-%%DATADIR%%/AdminHtml/images/icon_generic.gif
-%%DATADIR%%/AdminHtml/images/icon_group.gif
-%%DATADIR%%/AdminHtml/images/icon_movie.gif
-%%DATADIR%%/AdminHtml/images/icon_movie_off.gif
-%%DATADIR%%/AdminHtml/images/icon_playlist.gif
-%%DATADIR%%/AdminHtml/images/icon_playlist_off.gif
-%%DATADIR%%/AdminHtml/images/icon_start_playlist.gif
-%%DATADIR%%/AdminHtml/images/icon_stop_playlist.gif
-%%DATADIR%%/AdminHtml/images/icon_user.gif
-%%DATADIR%%/AdminHtml/images/invis_dragcover.gif
-%%DATADIR%%/AdminHtml/images/line.gif
-%%DATADIR%%/AdminHtml/images/link.gif
-%%DATADIR%%/AdminHtml/images/link_disabled.gif
-%%DATADIR%%/AdminHtml/images/mp3_file.gif
-%%DATADIR%%/AdminHtml/images/nav_help.gif
-%%DATADIR%%/AdminHtml/images/nav_logo.gif
-%%DATADIR%%/AdminHtml/images/nav_logo_small.gif
-%%DATADIR%%/AdminHtml/images/pixel.gif
-%%DATADIR%%/AdminHtml/images/scroll_arrow_down.gif
-%%DATADIR%%/AdminHtml/images/scroll_arrow_up.gif
-%%DATADIR%%/AdminHtml/images/scroll_bg.gif
-%%DATADIR%%/AdminHtml/images/scroll_bg_inactive.gif
-%%DATADIR%%/AdminHtml/images/scroll_thumb.gif
-%%DATADIR%%/AdminHtml/images/sort_arrow.gif
-%%DATADIR%%/AdminHtml/images/sort_arrow_desc.gif
-%%DATADIR%%/AdminHtml/images/spacer.gif
-%%DATADIR%%/AdminHtml/images/stripes_gray.gif
-%%DATADIR%%/AdminHtml/images/stripes_gray_dark.gif
-%%DATADIR%%/AdminHtml/images/trashcan.gif
-%%DATADIR%%/AdminHtml/images/vert_line.gif
-%%DATADIR%%/AdminHtml/images/weight_up_arrow.gif
-%%DATADIR%%/AdminHtml/images/whitepixel.gif
-%%DATADIR%%/AdminHtml/images/wieght_down_arrow.gif
-%%DATADIR%%/AdminHtml/includes/DarwinDragWidget.js
-%%DATADIR%%/AdminHtml/includes/DarwinListbox.js
-%%DATADIR%%/AdminHtml/includes/draglib.js
-%%DATADIR%%/AdminHtml/includes/encode_unicode.js
-%%DATADIR%%/AdminHtml/includes/standardNav.js
-%%DATADIR%%/AdminHtml/index.html
-%%DATADIR%%/AdminHtml/listbox.html
-%%DATADIR%%/AdminHtml/listbox2.html
-%%DATADIR%%/AdminHtml/log_settings.html
-%%DATADIR%%/AdminHtml/login.html
-%%DATADIR%%/AdminHtml/nav.html
-%%DATADIR%%/AdminHtml/parse_xml.cgi
-%%DATADIR%%/AdminHtml/password-utils.pl
-%%DATADIR%%/AdminHtml/playlist-lib.pl
-%%DATADIR%%/AdminHtml/playlist_detail.html
-%%DATADIR%%/AdminHtml/playlist_error_log.html
-%%DATADIR%%/AdminHtml/playlists.html
-%%DATADIR%%/AdminHtml/ports.html
-%%DATADIR%%/AdminHtml/relay.html
-%%DATADIR%%/AdminHtml/relay_details.html
-%%DATADIR%%/AdminHtml/relay_details_default.html
-%%DATADIR%%/AdminHtml/relay_status.html
-%%DATADIR%%/AdminHtml/relay_targets.html
-%%DATADIR%%/AdminHtml/relayxmlparser.pl
-%%DATADIR%%/AdminHtml/restart_broadcaster.html
-%%DATADIR%%/AdminHtml/setup_assistant.html
-%%DATADIR%%/AdminHtml/setup_assistant2.html
-%%DATADIR%%/AdminHtml/setup_assistant3.html
-%%DATADIR%%/AdminHtml/setup_assistant4.html
-%%DATADIR%%/AdminHtml/setup_assistant5.html
-%%DATADIR%%/AdminHtml/start_broadcaster.html
-%%DATADIR%%/AdminHtml/start_server.html
-%%DATADIR%%/AdminHtml/startplaylists.pl
-%%DATADIR%%/AdminHtml/tag_formats.pl
-%%DATADIR%%/AdminHtml/tag_types.pl
-%%DATADIR%%/AdminHtml/tag_vals.pl
-%%DATADIR%%/AdminHtml/template.html
-%%DATADIR%%/AdminHtml/template_blank.html
-%%DATADIR%%/AdminHtml/top.html
-%%DATADIR%%/AdminHtml/users.html
-%%DATADIR%%/AdminHtml/view_broadcast.cgi
-%%DATADIR%%/AdminHtml/welcome.html
-%%DATADIR%%/movies/sample.mp3
-%%DATADIR%%/movies/sample_100kbit.mov
-%%DATADIR%%/movies/sample_100kbit.mp4
-%%DATADIR%%/movies/sample_300kbit.mov
-%%DATADIR%%/movies/sample_300kbit.mp4
-%%DATADIR%%/movies/sample_50kbit.3gp
-%%DATADIR%%/movies/sample_h264_100kbit.mp4
-%%DATADIR%%/movies/sample_h264_1mbit.mp4
-%%DATADIR%%/movies/sample_h264_300kbit.mp4
-etc/streaming/qtusers-dist
-etc/streaming/qtgroups-dist
-@unexec if cmp -s %D/etc/streaming/relayconfig.xml %D/etc/streaming/relayconfig.xml-dist; then rm -f %D/etc/streaming/relayconfig.xml; fi
-etc/streaming/relayconfig.xml-dist
-@exec [ ! -f %B/relayconfig.xml ] && cp %B/%f %B/relayconfig.xml
-@unexec if cmp -s %D/etc/streaming/streamingserver.xml %D/etc/streaming/streamingserver.xml-dist; then rm -f %D/etc/streaming/streamingserver.xml; fi
-etc/streaming/streamingserver.xml-dist
-@exec [ ! -f %B/streamingserver.xml ] && cp %B/%f %B/streamingserver.xml
-@unexec if cmp -s %D/etc/streaming/streamingloadtool.conf %D/etc/streaming/streamingloadtool.conf-dist; then rm -f %D/etc/streaming/streamingloadtool.conf; fi
-etc/streaming/streamingloadtool.conf-dist
-@exec [ ! -f %B/streamingloadtool.conf ] && cp %B/%f %B/streamingloadtool.conf
-@dirrm %%DATADIR%%/AdminHtml/includes
-@dirrm %%DATADIR%%/AdminHtml/images
-@dirrm %%DATADIR%%/AdminHtml/html_en
-@dirrm %%DATADIR%%/AdminHtml
-@dirrmtry %%DATADIR%%/movies
-@dirrmtry %%DATADIR%%
-@dirrmtry libexec/StreamingServerModules
-@exec   mkdir %D/libexec/StreamingServerModules 2>/dev/null || true
-@dirrmtry etc/streaming
-@unexec rmdir /var/spool/streaming.playlists    2>/dev/null || true
-@exec   mkdir /var/spool/streaming.playlists    2>/dev/null || true
-@exec   chown -Rh qtss:qtss /var/spool/streaming.playlists
-@unexec rmdir /var/log/streaming                2>/dev/null || true
-@exec   mkdir /var/log/streaming                2>/dev/null || true
diff --git a/net/Makefile b/net/Makefile
index 57c6bdea485f..1af30ff6ca03 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -6,13 +6,11 @@
     SUBDIR += 3proxy
     SUBDIR += 44bsd-rdist
     SUBDIR += 6tunnel
-    SUBDIR += DarwinStreamingServer
     SUBDIR += GeoIP
     SUBDIR += R-cran-twitteR
     SUBDIR += Sockets
     SUBDIR += abills
     SUBDIR += activemq
-    SUBDIR += acx100
     SUBDIR += adasockets
     SUBDIR += afpfs-ng
     SUBDIR += aget
@@ -40,8 +38,6 @@
     SUBDIR += avahi-qt4
     SUBDIR += avahi-sharp
     SUBDIR += babeld
-    SUBDIR += balance
-    SUBDIR += bcusdk-eibd
     SUBDIR += beacon
     SUBDIR += beanstalkd
     SUBDIR += belle-sip
@@ -51,8 +47,6 @@
     SUBDIR += bird-devel
     SUBDIR += bird6
     SUBDIR += bittwist
-    SUBDIR += blam
-    SUBDIR += bld
     SUBDIR += bmon
     SUBDIR += boclient
     SUBDIR += boinc-client
@@ -68,11 +62,8 @@
     SUBDIR += chrony
     SUBDIR += citrix_ica
     SUBDIR += clamz
-    SUBDIR += click
     SUBDIR += clusterit
     SUBDIR += cnd
-    SUBDIR += cnet
-    SUBDIR += cnupm
     SUBDIR += coda6_client
     SUBDIR += coda6_server
     SUBDIR += corkscrew
@@ -81,7 +72,6 @@
     SUBDIR += cryptcat
     SUBDIR += csocks
     SUBDIR += csync2
-    SUBDIR += ct
     SUBDIR += ctrace
     SUBDIR += cvsup
     SUBDIR += cvsup-without-gui
@@ -122,7 +112,6 @@
     SUBDIR += ecore-con
     SUBDIR += empty
     SUBDIR += enet
-    SUBDIR += entitymib
     SUBDIR += erlang_xmlrpc
     SUBDIR += etherboot
     SUBDIR += etrace
@@ -137,7 +126,6 @@
     SUBDIR += fping
     SUBDIR += freebsd-tftp
     SUBDIR += freebsd-uucp
-    SUBDIR += freedbd
     SUBDIR += freenet6
     SUBDIR += freeradius-client
     SUBDIR += freeradius2
@@ -146,9 +134,7 @@
     SUBDIR += freeswitch-core-devel
     SUBDIR += freeswitch-devel
     SUBDIR += freevrrpd
-    SUBDIR += frickin
     SUBDIR += fspclient
-    SUBDIR += fspd
     SUBDIR += fsplib
     SUBDIR += g2ipmsg
     SUBDIR += geoipupdate
@@ -194,10 +180,7 @@
     SUBDIR += hanstunnel
     SUBDIR += haproxy
     SUBDIR += haproxy-devel
-    SUBDIR += hawknl
-    SUBDIR += hawknl-devel
     SUBDIR += hexinject
-    SUBDIR += heybuddy
     SUBDIR += hidentd
     SUBDIR += hinfo
     SUBDIR += hlmaster
@@ -240,13 +223,11 @@
     SUBDIR += imapproxy
     SUBDIR += iodine
     SUBDIR += ip6_int
-    SUBDIR += ipa_ipfw
     SUBDIR += ipgrab
     SUBDIR += iplog
     SUBDIR += ipsorc
     SUBDIR += ipsumdump
     SUBDIR += ipsvd
-    SUBDIR += irrd
     SUBDIR += isc-dhcp41-client
     SUBDIR += isc-dhcp41-relay
     SUBDIR += isc-dhcp41-server
@@ -256,7 +237,6 @@
     SUBDIR += isc-dhcp43-client
     SUBDIR += isc-dhcp43-relay
     SUBDIR += isc-dhcp43-server
-    SUBDIR += iscsi-target
     SUBDIR += istgt
     SUBDIR += jags
     SUBDIR += jakarta-commons-net
@@ -278,7 +258,6 @@
     SUBDIR += kissd
     SUBDIR += knc
     SUBDIR += knemo-kde4
-    SUBDIR += kojoney
     SUBDIR += krdc
     SUBDIR += krfb
     SUBDIR += kwooty
@@ -340,7 +319,6 @@
     SUBDIR += libsocket++
     SUBDIR += libsocketcpp
     SUBDIR += libsrtp
-    SUBDIR += libtcp4u
     SUBDIR += libtnl
     SUBDIR += libtrace
     SUBDIR += libunp
@@ -366,7 +344,6 @@
     SUBDIR += mDNSResponder
     SUBDIR += mad_fcl
     SUBDIR += mcast-tools
-    SUBDIR += mediaproxy
     SUBDIR += mediastreamer
     SUBDIR += mediatomb
     SUBDIR += mgen
@@ -378,8 +355,6 @@
     SUBDIR += miniupnpc
     SUBDIR += miniupnpd
     SUBDIR += miredo
-    SUBDIR += mknbi
-    SUBDIR += mmucl
     SUBDIR += mono-zeroconf
     SUBDIR += mopd
     SUBDIR += morebalance
@@ -400,7 +375,6 @@
     SUBDIR += nbd-server
     SUBDIR += nc
     SUBDIR += ncp
-    SUBDIR += ncplib
     SUBDIR += ndisc6
     SUBDIR += ndpi
     SUBDIR += nemesis
@@ -422,8 +396,6 @@
     SUBDIR += netwib
     SUBDIR += neubot
     SUBDIR += nfsshell
-    SUBDIR += ng_daphne
-    SUBDIR += ng_mikrotik_eoip
     SUBDIR += ngrep
     SUBDIR += nifmon
     SUBDIR += nload
@@ -455,7 +427,6 @@
     SUBDIR += onioncat
     SUBDIR += opal
     SUBDIR += openafs
-    SUBDIR += openam
     SUBDIR += openbgpd
     SUBDIR += opendpi
     SUBDIR += openggsn
@@ -463,7 +434,6 @@
     SUBDIR += openldap24-client
     SUBDIR += openldap24-sasl-client
     SUBDIR += openldap24-server
-    SUBDIR += openmcu
     SUBDIR += openmpi
     SUBDIR += openmpi-devel
     SUBDIR += openmq
@@ -473,7 +443,6 @@
     SUBDIR += openospfd
     SUBDIR += openpgm
     SUBDIR += openradius
-    SUBDIR += openser
     SUBDIR += openslp
     SUBDIR += opentracker
     SUBDIR += openvswitch
@@ -847,7 +816,6 @@
     SUBDIR += pecl-yaz
     SUBDIR += pecl-yp
     SUBDIR += pen
-    SUBDIR += pfflowd
     SUBDIR += pfinger
     SUBDIR += phamm
     SUBDIR += php5-ldap
@@ -963,7 +931,6 @@
     SUBDIR += qt5-network
     SUBDIR += qtweetlib
     SUBDIR += quagga
-    SUBDIR += quagga-re
     SUBDIR += queso
     SUBDIR += quiterss
     SUBDIR += quoted
@@ -997,13 +964,10 @@
     SUBDIR += remotedesk
     SUBDIR += repeater
     SUBDIR += reposado
-    SUBDIR += rexx-sock
     SUBDIR += rfbproxy
     SUBDIR += rinetd
     SUBDIR += ripe-whois
-    SUBDIR += ris
     SUBDIR += rp-pppoe
-    SUBDIR += rshell
     SUBDIR += rsplib
     SUBDIR += rsync
     SUBDIR += rsync-bpc
@@ -1081,7 +1045,6 @@
     SUBDIR += samba36
     SUBDIR += samba4
     SUBDIR += samba41
-    SUBDIR += samba4wins
     SUBDIR += samplicator
     SUBDIR += sbd
     SUBDIR += scamper
@@ -1096,7 +1059,6 @@
     SUBDIR += sendemail
     SUBDIR += sendsms
     SUBDIR += sendsnpp
-    SUBDIR += ser
     SUBDIR += serveez
     SUBDIR += service-discovery-applet
     SUBDIR += serviio
@@ -1106,9 +1068,6 @@
     SUBDIR += shelldap
     SUBDIR += shmux
     SUBDIR += sie-nmsg
-    SUBDIR += silc-client
-    SUBDIR += silc-irssi-plugin
-    SUBDIR += silc-server
     SUBDIR += simpleproxy
     SUBDIR += sip_scenario
     SUBDIR += sippy_b2bua
@@ -1116,8 +1075,6 @@
     SUBDIR += sipsak
     SUBDIR += sixxs-aiccu
     SUBDIR += skstream
-    SUBDIR += skyfish
-    SUBDIR += skystar2
     SUBDIR += sl2tps
     SUBDIR += slirp
     SUBDIR += slurm
@@ -1159,7 +1116,6 @@
     SUBDIR += syncthing-cli
     SUBDIR += syncthing-discosrv
     SUBDIR += tableutil
-    SUBDIR += tac_plus-libradius
     SUBDIR += tac_plus4
     SUBDIR += tapidbus
     SUBDIR += tayga
@@ -1183,7 +1139,6 @@
     SUBDIR += tcpstat
     SUBDIR += tcptrace
     SUBDIR += tcptraceroute
-    SUBDIR += tcptraceroute-devel
     SUBDIR += tcpview
     SUBDIR += tcpwatch
     SUBDIR += tcpxd
@@ -1236,11 +1191,8 @@
     SUBDIR += urlendec
     SUBDIR += usbredir
     SUBDIR += userfw
-    SUBDIR += ushare
     SUBDIR += utftpd
-    SUBDIR += v6eval
     SUBDIR += vblade
-    SUBDIR += vchat
     SUBDIR += vde
     SUBDIR += vde2
     SUBDIR += vinagre
@@ -1250,16 +1202,12 @@
     SUBDIR += vncreflector
     SUBDIR += vnstat
     SUBDIR += vortex
-    SUBDIR += vserver
     SUBDIR += vtun
     SUBDIR += wackamole
     SUBDIR += wackford-squeers
     SUBDIR += wakeonlan
     SUBDIR += whois
     SUBDIR += widentd
-    SUBDIR += wire
-    SUBDIR += wired
-    SUBDIR += wired-tracker
     SUBDIR += wireshark
     SUBDIR += wireshark-lite
     SUBDIR += wizd
@@ -1281,17 +1229,14 @@
     SUBDIR += x11vnc
     SUBDIR += x2goclient
     SUBDIR += x2goclient-cli
-    SUBDIR += xbone
     SUBDIR += xboxproxy
     SUBDIR += xferstats
-    SUBDIR += xipdump
     SUBDIR += xipmsg
     SUBDIR += xisp
     SUBDIR += xmlrpc-c
     SUBDIR += xmlrpc-c-devel
     SUBDIR += xmlrpc-epi
     SUBDIR += xorp
-    SUBDIR += xorp-devel
     SUBDIR += xprobe
     SUBDIR += xpvm
     SUBDIR += xrdesktop
diff --git a/net/acx100/Makefile b/net/acx100/Makefile
deleted file mode 100644
index 955c0b78ba06..000000000000
--- a/net/acx100/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# Created by: Leonid Zolotarev <leoz.2005@gmail.com>
-# $FreeBSD$
-
-PORTNAME=	acx
-PORTVERSION=	6.1
-PORTEPOCH=	1
-CATEGORIES=	net kld
-MASTER_SITES=	http://dev.kewl.org/acx100+111/:file_0 \
-		ftp://ftp.dlink.co.uk/wireless/dwl-650+/:file_1 \
-		http://freebsd.csie.nctu.edu.tw/pub/distfiles/acx/:file_1 \
-		http://download.tdc.dk/pub/tdconline/kundeservice/firmware/netkort/:file_2 \
-		ftp://downloads.netgear.com/files/:file_2
-DISTFILES=	${DISTFILE_0}:file_0 \
-		${DISTFILE_1}:file_1 \
-		${DISTFILE_2}:file_2
-DIST_SUBDIR=	acx
-EXTRACT_ONLY=	${DISTFILE_0}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Texas Instruments (TI) ACX100 and ACX111 IEEE 802.11 driver
-
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-
-NO_PACKAGE=	This port should be recompiled for a particular FreeBSD kernel
-ONLY_FOR_ARCHS=	amd64 i386
-
-MAN4=		if_acx.4
-
-DISTFILE_0=	${DISTNAME}.tgz
-DISTFILE_1=	dwl-650+_drv_v3.06_1007_inc_utility.zip
-DISTFILE_2=	wg311v2_v2_0_0_7.zip
-FIRMWAREDIR=	firmware
-KMODDIR?=	/boot/modules
-
-MAKE_ENV+=	KMODDIR="${KMODDIR}"
-PLIST_SUB+=	KMODDIR=${KMODDIR}
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 900002
-IGNORE=		depends on removed if_watchdog member in struct ifnet
-.endif
-
-pre-fetch:
-.if !exists(${SRC_BASE}/sys/Makefile)
-IGNORE=		requires the kernel sources to be available
-.endif
-
-post-patch:
-.if ${OSVERSION} >= 800049
-	@${REINPLACE_CMD} -e 's/suser(thred)/priv_check(thred, PRIV_DRIVER)/' \
-		${WRKSRC}/acx/if_acxifnet.c
-.endif
-
-pre-build:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_1} ${WRKSRC}/${FIRMWAREDIR}/acx100 && \
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_2} ${WRKSRC}/${FIRMWAREDIR}/acx111 && \
-	cd ${BUILD_WRKSRC}/${FIRMWAREDIR} && \
-	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
-
-# Prevent auxiliary bin2h programm from being installed
-pre-install:
-	@${REINPLACE_CMD} -e 's/bin2h //' ${WRKSRC}/Makefile
-
-do-install:
-	@cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}
-	${INSTALL_MAN} ${WRKSRC}/acx/if_acx.4 ${PREFIX}/man/man4
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/net/acx100/distinfo b/net/acx100/distinfo
deleted file mode 100644
index 4531f40e4c5f..000000000000
--- a/net/acx100/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-SHA256 (acx/acx-6.1.tgz) = cfdcbed853202e5aa72d78ae440945dcb92f3faffa1ed41eba1c264168c1a4d5
-SIZE (acx/acx-6.1.tgz) = 62929
-SHA256 (acx/dwl-650+_drv_v3.06_1007_inc_utility.zip) = 5922ac7410e1dfc7e34957a9e8cd605087ca1d9fbe5829c7c102fbb72d75708f
-SIZE (acx/dwl-650+_drv_v3.06_1007_inc_utility.zip) = 2464165
-SHA256 (acx/wg311v2_v2_0_0_7.zip) = 5941f1b113e49c2b9aff3d60bef9ecc9f4ffd972c876df913aa182e925b995bf
-SIZE (acx/wg311v2_v2_0_0_7.zip) = 16518095
diff --git a/net/acx100/pkg-descr b/net/acx100/pkg-descr
deleted file mode 100644
index 30d463b5213b..000000000000
--- a/net/acx100/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-Texas Instruments (TI) ACX100/111 IEEE 802.11 driver.
-
-The acx driver supports ACX100/111 based Cardbus or PCI network adapters.
-
-The following cards are known to work with the acx driver:
-
-Card			Bus		Type
-Binatone WL-1000	CARDBUS		ACX100
-D-Link DWL-650+		CARDBUS		ACX100
-US Robotics USR2210	CARDBUS		ACX100
-US Robotics USR2216	PCI		ACX100
-D-Link DWL-G650+	CARDBUS		ACX111
-D-Link DWL-G520+	PCI		ACX111
-US Robotics USR5416	PCI		ACX111
-SAFECOM SWLPT-54125	PCI		ACX111
-
-WWW: http://dev.kewl.org/
diff --git a/net/acx100/pkg-message b/net/acx100/pkg-message
deleted file mode 100644
index 065777d5adb6..000000000000
--- a/net/acx100/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-------------------------------------------------------------------------------
-    Please, remember to reinstall the port after kernel source update.
-------------------------------------------------------------------------------
-    To enable the driver, execute:
-
-	# echo 'if_acx_load="YES"' >> /boot/loader.conf
-------------------------------------------------------------------------------
diff --git a/net/acx100/pkg-plist b/net/acx100/pkg-plist
deleted file mode 100644
index a1052295922c..000000000000
--- a/net/acx100/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/ifdo
-sbin/acxtool
-@cwd %%KMODDIR%%
-if_acx.ko
-if_acx.ko.symbols
-acx100fw.ko
-acx111fw.ko
-@unexec kldxref %D
diff --git a/net/balance/Makefile b/net/balance/Makefile
deleted file mode 100644
index 89b95120a550..000000000000
--- a/net/balance/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Created by: Joseph Scott <joseph@randomnetworks.com>
-# $FreeBSD$
-
-PORTNAME=	balance
-PORTVERSION=	3.54
-CATEGORIES=	net
-MASTER_SITES=	http://www.inlab.de/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Simple but powerful generic TCP proxy with round robin features
-
-ALL_TARGET=	balance
-USE_RC_SUBR=	balance
-
-MAN1=		balance.1
-
-NO_STAGE=	yes
-pre-build:
-	@${REINPLACE_CMD} -e 's|^CFLAGS|CFLAGS?|' \
-	-e 's|^CC|CC?|' ${WRKSRC}/Makefile
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/balance ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/balance.1 ${MAN1PREFIX}/man/man1
-	@${MKDIR} /var/run/balance
-
-.include <bsd.port.mk>
diff --git a/net/balance/distinfo b/net/balance/distinfo
deleted file mode 100644
index a3a9f9a3e23e..000000000000
--- a/net/balance/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (balance-3.54.tar.gz) = 170b1a5dd60a566a785b72afde42a349e20fe01f53263db1279f71ef188efe45
-SIZE (balance-3.54.tar.gz) = 35166
diff --git a/net/balance/files/balance.in b/net/balance/files/balance.in
deleted file mode 100644
index 5f80783f5ffb..000000000000
--- a/net/balance/files/balance.in
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: balance
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable balance:
-#
-#balance_enable="YES"
-#balance_hosts="host1"
-#balance_host1_flags="-a"
-#balance_host1_address="host1.external.example"
-#balance_host1_ports="http 8180"
-#balance_host1_targets="host1.internal.example"
-#
-# See balance(8) for flags
-#
-
-. /etc/rc.subr
-
-name=balance
-rcvar=balance_enable
-command=%%PREFIX%%/bin/balance
-
-start_cmd=start_cmd
-stop_cmd=stop_cmd
-status_cmd=status_cmd
-
-start_cmd()
-{
-	if [ -x "${command}" ]; then
-		for host in ${balance_hosts}; do
-			eval ports=\"\${balance_${host}_ports}\"
-			eval flags=\"\${balance_${host}_flags}\"
-			eval address=\"\${balance_${host}_address}\"
-			eval targets=\"\${balance_${host}_targets}\"
-			if [ "" != "${address}" ]; then
-				flags="${flags} -b ${address}"
-			fi
-			for port in ${ports}; do
-				"${command}" ${flags} ${port} ${targets}
-			done
-		done
-	fi
-}
-
-stop_cmd()
-{
-	if [ -x "${command}" ]; then
-		for host in ${balance_hosts}; do
-			eval ports=\"\${balance_${host}_ports}\"
-			eval address=\"\${balance_${host}_address}\"
-			flags=""
-			if [ "" != "${address}" ]; then
-				flags="-b ${address}"
-			else
-				address='*'
-			fi
-			for port in ${ports}; do
-				echo "balance at ${address}:${port}"
-				"${command}" ${flags} -c kill ${port}
-			done
-		done
-	fi
-}
-
-status_cmd()
-{
-	if [ -x "${command}" ]; then
-		for host in ${balance_hosts}; do
-			eval ports=\"\${balance_${host}_ports}\"
-			eval address=\"\${balance_${host}_address}\"
-			flags=""
-			if [ "" != "${address}" ]; then
-				flags="-b ${address}"
-			else
-				address='*'
-			fi
-			for port in ${ports}; do
-				echo "balance at ${address}:${port}"
-				"${command}" ${flags} -c show ${port}
-			done
-		done
-	fi
-}
-
-# set defaults
-
-balance_enable=${balance_enable:-"NO"}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/net/balance/pkg-descr b/net/balance/pkg-descr
deleted file mode 100644
index 3a12b01488b0..000000000000
--- a/net/balance/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Balance is a simple but powerful generic tcp proxy with round robin load
-balancing and failover mechanisms. Its behaviour can be controlled at runtime
-using a simple command line syntax.
-
-The latest release now supports the definition of channel groups and
-connection counting and handling boosting the power and versatility of
-balance one big step further.
-
-WWW: http://balance.sourceforge.net/
diff --git a/net/balance/pkg-plist b/net/balance/pkg-plist
deleted file mode 100644
index 2bd3e0492168..000000000000
--- a/net/balance/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/balance
-@exec mkdir /var/run/balance
-@unexec rmdir /var/run/balance 2>/dev/null || true
diff --git a/net/bcusdk-eibd/Makefile b/net/bcusdk-eibd/Makefile
deleted file mode 100644
index 61a413ef44d3..000000000000
--- a/net/bcusdk-eibd/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# Created by: Björn König <bkoenig@alpha-tierchen.de>
-# $FreeBSD$
-
-PORTNAME=	bcusdk
-PORTVERSION=	0.0.4
-CATEGORIES=	net
-MASTER_SITES=	http://www.auto.tuwien.ac.at/~mkoegler/eib/
-PKGNAMESUFFIX=	-eibd
-DISTFILES=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The EIBnet/IP server of the BCU SDK
-
-LIB_DEPENDS=	libpthsem.so:${PORTSDIR}/devel/pthsem
-BUILD_DEPENDS=	${LOCALBASE}/lib/libargp.a:${PORTSDIR}/devel/argp-standalone
-
-GNU_CONFIGURE=	yes
-USES=		gmake
-CONFIGURE_ARGS+=--enable-onlyeibd \
-		--disable-usb \
-		--enable-eibnetip \
-		--enable-eibnetipserver \
-		--enable-eibnetiptunnel \
-		--enable-groupcache \
-		CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
-		CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS}"
-
-OPTIONS_DEFINE=	JAVA EXAMPLES
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MJAVA}
-CONFIGURE_ARGS+=--enable-java
-USE_JAVA=	yes
-PLIST_SUB+=	JAVA=""
-.else
-PLIST_SUB+=	JAVA="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MEXAMPLES}
-PLIST_SUB+=	EXAMPLES=""
-.else
-PLIST_SUB+=	EXAMPLES="@comment "
-.endif
-
-pre-patch:
-	@${REINPLACE_CMD} "s,-ri,-Ei.bak," ${WRKSRC}/eibd/client/php/Makefile.in
-	@${REINPLACE_CMD} "s, bcu,," ${WRKSRC}/eibd/Makefile.in
-	@${REINPLACE_CMD} "s, php,," ${WRKSRC}/eibd/client/Makefile.in
-.if ! ${PORT_OPTIONS:MEXAMPLES}
-	@${REINPLACE_CMD} "s, examples,," ${WRKSRC}/eibd/Makefile.in
-.else
-	@${REINPLACE_CMD} -e "s,^\(examplesdir = \).*,\1${EXAMPLESDIR}," \
-		-e "s,^\(bindir = \).*,\1${EXAMPLESDIR}/bin," \
-		${WRKSRC}/eibd/examples/Makefile.in
-.endif
-.if ${PORT_OPTIONS:MJAVA}
-	@${REINPLACE_CMD} "s,^\(javadir = \).*,\1${JAVASHAREDIR}," ${WRKSRC}/eibd/client/java/Makefile.in
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/bcusdk-eibd/distinfo b/net/bcusdk-eibd/distinfo
deleted file mode 100644
index 4da761d76c11..000000000000
--- a/net/bcusdk-eibd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (bcusdk_0.0.4.tar.gz) = 4d5cec9ae2d45e17ef2f566cb84f6895ae49255c86aacebc5af40839f1b5c0e9
-SIZE (bcusdk_0.0.4.tar.gz) = 574603
diff --git a/net/bcusdk-eibd/pkg-descr b/net/bcusdk-eibd/pkg-descr
deleted file mode 100644
index 1a7ceeacbfab..000000000000
--- a/net/bcusdk-eibd/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-The European Installation Bus (EIB) is a field bus system for home and building
-automation. This package contains the EIBnet/IP tunneling and routing daemon
-which is part of the BCU SDK. It provides access to an EIB bus over TCP/IP and
-Unix domain sockets.
-
-WWW: http://www.auto.tuwien.ac.at/~mkoegler/index.php/eibd
diff --git a/net/bcusdk-eibd/pkg-plist b/net/bcusdk-eibd/pkg-plist
deleted file mode 100644
index 7acd36bf4e64..000000000000
--- a/net/bcusdk-eibd/pkg-plist
+++ /dev/null
@@ -1,108 +0,0 @@
-bin/eibd
-bin/eibnetdescribe
-bin/eibnetsearch
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/busmonitor1
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/busmonitor2
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupcacheclear
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupcachedisable
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupcacheenable
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupcacheread
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupcachereadsync
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupcacheremove
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/grouplisten
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupread
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupreadresponse
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupresponse
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupsocketlisten
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupsocketread
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupsocketswrite
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupsocketwrite
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupsresponse
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupswrite
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupwrite
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/knxtool
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/madcread
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/maskver
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/mmaskver
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/mpeitype
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/mprogmodeoff
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/mprogmodeon
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/mprogmodestatus
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/mprogmodetoggle
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/mpropdesc
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/mpropread
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/mpropscan
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/mpropscanpoll
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/mpropwrite
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/mread
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/mrestart
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/msetkey
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/mwrite
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/mwriteplain
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/progmodeoff
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/progmodeon
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/progmodestatus
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/progmodetoggle
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/readindividual
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/vbusmonitor1
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/vbusmonitor1poll
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/vbusmonitor2
-%%EXAMPLES%%%%EXAMPLESDIR%%/bin/writeaddress
-%%EXAMPLES%%%%EXAMPLESDIR%%/busmonitor1.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/busmonitor2.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/common.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/common.h
-%%EXAMPLES%%%%EXAMPLESDIR%%/groupcacheclear.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/groupcachedisable.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/groupcacheenable.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/groupcacheread.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/groupcachereadsync.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/groupcacheremove.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/grouplisten.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/groupread.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/groupreadresponse.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/groupresponse.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/groupsocketlisten.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/groupsocketread.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/groupsocketswrite.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/groupsocketwrite.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/groupsresponse.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/groupswrite.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/groupwrite.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/knxtool.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/madcread.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/maskver.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/mmaskver.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/mpeitype.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/mprogmodeoff.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/mprogmodeon.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/mprogmodestatus.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/mprogmodetoggle.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/mpropdesc.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/mpropread.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/mpropscan.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/mpropscanpoll.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/mpropwrite.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/mread.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/mrestart.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/msetkey.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/mwrite.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/mwriteplain.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/progmodeoff.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/progmodeon.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/progmodestatus.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/progmodetoggle.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/readindividual.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/vbusmonitor1.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/vbusmonitor1poll.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/vbusmonitor2.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/writeaddress.c
-%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/bin
-%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%DATADIR%%/EIBConnection.cs
-@dirrm %%DATADIR%%
-%%JAVA%%%%JAVASHAREDIR%%/eibclient.jar
-include/eibclient.h
-include/eibloadresult.h
-include/eibtypes.h
-lib/libeibclient.a
diff --git a/net/blam/Makefile b/net/blam/Makefile
deleted file mode 100644
index fc60cecd5db3..000000000000
--- a/net/blam/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
-# $FreeBSD$
-
-PORTNAME=	blam
-PORTVERSION=	1.8.7
-PORTREVISION=	4
-CATEGORIES=	net
-MASTER_SITES=	http://www.cmartin.tk/${PORTNAME}/ \
-		http://romain.blogreen.org/distfiles/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Simple feed reader for GNOME
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/webkit-sharp-1.0.pc:${PORTSDIR}/www/webkit-sharp
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GMSGFMT="${LOCALBASE}/bin/msgfmt" DATADIRNAME="share"
-USE_GNOME=	gnomesharp20
-USES=		gettext gmake pkgconfig
-INSTALLS_ICONS=	yes
-GCONF_SCHEMAS=	blam.schemas
-
-MAN1=		blam.1
-
-NO_STAGE=	yes
-.include <bsd.port.mk>
diff --git a/net/blam/distinfo b/net/blam/distinfo
deleted file mode 100644
index cd42a925d239..000000000000
--- a/net/blam/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (blam-1.8.7.tar.gz) = 44d35782a1105fb040f790aed54048c4c563daee25a1ced07641174939c05b6e
-SIZE (blam-1.8.7.tar.gz) = 319041
diff --git a/net/blam/pkg-descr b/net/blam/pkg-descr
deleted file mode 100644
index 58b319915d78..000000000000
--- a/net/blam/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Blam is a tool that helps you keep track of the growing number of news
-feeds distributed as RSS. Blam lets you subscribe to any number of feeds
-and provides an easy to use and clean interface to stay up to date.  It
-is written in C# and uses Mono, GTK#, and RSS.NET.
- 
-Among the features are:
-
-* Support for RSS and RDF feeds
-* Very easy to use interface
-* Print the news entries you like
-* Automatically update the feeds at regular intervals
-
-WWW: http://www.cmartin.tk/blam.html
diff --git a/net/blam/pkg-plist b/net/blam/pkg-plist
deleted file mode 100644
index 48f6c7e229e5..000000000000
--- a/net/blam/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-bin/blam
-lib/blam/AtomFeed.dll
-lib/blam/RSSFeed.dll
-lib/blam/blam.exe
-lib/blam/blam.exe.config
-lib/blam/blam.exe.mdb
-share/applications/blam.desktop
-%%DATADIR%%/collection.xml
-%%DATADIR%%/themes/akregator/theme.html
-%%DATADIR%%/themes/blam/blam-box-bottom-left.png
-%%DATADIR%%/themes/blam/blam-box-bottom-right.png
-%%DATADIR%%/themes/blam/blam-box-pad.png
-%%DATADIR%%/themes/blam/blam-box-top-left.png
-%%DATADIR%%/themes/blam/blam-box-top-right.png
-%%DATADIR%%/themes/blam/blam.css
-%%DATADIR%%/themes/blam/theme.html
-%%DATADIR%%/themes/pimped/blam.png
-%%DATADIR%%/themes/pimped/news.png
-%%DATADIR%%/themes/pimped/pimped.css
-%%DATADIR%%/themes/pimped/theme.html
-%%DATADIR%%/themes/planet/bubble-bottom-left.png
-%%DATADIR%%/themes/planet/bubble-bottom-right.png
-%%DATADIR%%/themes/planet/bubble-bottom.png
-%%DATADIR%%/themes/planet/bubble-left.png
-%%DATADIR%%/themes/planet/bubble-nipple.png
-%%DATADIR%%/themes/planet/bubble-right.png
-%%DATADIR%%/themes/planet/bubble-top-left.png
-%%DATADIR%%/themes/planet/bubble-top-right.png
-%%DATADIR%%/themes/planet/bubble-top.png
-%%DATADIR%%/themes/planet/planet.css
-%%DATADIR%%/themes/planet/theme.html
-share/icons/hicolor/16x16/apps/blam.png
-share/icons/hicolor/22x22/apps/blam.png
-share/icons/hicolor/24x24/apps/blam.png
-share/icons/hicolor/32x32/apps/blam.png
-share/icons/hicolor/48x48/apps/blam.png
-share/icons/hicolor/scalable/apps/blam.svg
-share/locale/ar/LC_MESSAGES/blam.mo
-share/locale/bg/LC_MESSAGES/blam.mo
-share/locale/bs/LC_MESSAGES/blam.mo
-share/locale/ca/LC_MESSAGES/blam.mo
-share/locale/cs/LC_MESSAGES/blam.mo
-share/locale/da/LC_MESSAGES/blam.mo
-share/locale/de/LC_MESSAGES/blam.mo
-share/locale/dz/LC_MESSAGES/blam.mo
-share/locale/el/LC_MESSAGES/blam.mo
-share/locale/en_CA/LC_MESSAGES/blam.mo
-share/locale/en_GB/LC_MESSAGES/blam.mo
-share/locale/es/LC_MESSAGES/blam.mo
-share/locale/et/LC_MESSAGES/blam.mo
-share/locale/eu/LC_MESSAGES/blam.mo
-share/locale/fi/LC_MESSAGES/blam.mo
-share/locale/fr/LC_MESSAGES/blam.mo
-share/locale/ga/LC_MESSAGES/blam.mo
-share/locale/gu/LC_MESSAGES/blam.mo
-share/locale/he/LC_MESSAGES/blam.mo
-share/locale/hr/LC_MESSAGES/blam.mo
-share/locale/hu/LC_MESSAGES/blam.mo
-share/locale/it/LC_MESSAGES/blam.mo
-share/locale/ja/LC_MESSAGES/blam.mo
-share/locale/lt/LC_MESSAGES/blam.mo
-share/locale/lv/LC_MESSAGES/blam.mo
-share/locale/nb/LC_MESSAGES/blam.mo
-share/locale/ne/LC_MESSAGES/blam.mo
-share/locale/nl/LC_MESSAGES/blam.mo
-share/locale/oc/LC_MESSAGES/blam.mo
-share/locale/pa/LC_MESSAGES/blam.mo
-share/locale/pl/LC_MESSAGES/blam.mo
-share/locale/pt/LC_MESSAGES/blam.mo
-share/locale/pt_BR/LC_MESSAGES/blam.mo
-share/locale/ru/LC_MESSAGES/blam.mo
-share/locale/rw/LC_MESSAGES/blam.mo
-share/locale/sk/LC_MESSAGES/blam.mo
-share/locale/sl/LC_MESSAGES/blam.mo
-share/locale/sq/LC_MESSAGES/blam.mo
-share/locale/sr/LC_MESSAGES/blam.mo
-share/locale/sr@Latn/LC_MESSAGES/blam.mo
-share/locale/sv/LC_MESSAGES/blam.mo
-share/locale/tr/LC_MESSAGES/blam.mo
-share/locale/uk/LC_MESSAGES/blam.mo
-share/locale/vi/LC_MESSAGES/blam.mo
-share/locale/zh_CN/LC_MESSAGES/blam.mo
-share/locale/zh_HK/LC_MESSAGES/blam.mo
-share/locale/zh_TW/LC_MESSAGES/blam.mo
-@dirrm %%DATADIR%%/themes/planet
-@dirrm %%DATADIR%%/themes/pimped
-@dirrm %%DATADIR%%/themes/blam
-@dirrm %%DATADIR%%/themes/akregator
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%
-@dirrm lib/blam
diff --git a/net/bld/Makefile b/net/bld/Makefile
deleted file mode 100644
index c82cb58eb649..000000000000
--- a/net/bld/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# Created by: ob
-# $FreeBSD$
-
-PORTNAME=	bld
-PORTVERSION=	0.3.4
-CATEGORIES=	net
-MASTER_SITES=	http://www.online.redhate.org/bld/ \
-		http://olivier.beyssac.googlepages.com/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Blacklisting daemon
-
-USE_RC_SUBR=	bld
-MANCOMPRESSED=	yes
-GNU_CONFIGURE=	yes
-
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/bld
-PORTDOCS=	README README.postfix
-MAN5=		bld_whitelist.conf.5 bld_acl.conf.5 bld.conf.5
-MAN8=		bldsubmit.8 bld.8 bldquery.8 bldread.8 bldinsert.8 blddecr.8 \
-		bld-pf_policy.8 bld-pf_log.pl.8 bld-mrtg.pl.8 \
-		bld-will_spam_for_food.pl.8
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
-.endif
-	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.post.mk>
diff --git a/net/bld/distinfo b/net/bld/distinfo
deleted file mode 100644
index 03e9a039dae5..000000000000
--- a/net/bld/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (bld-0.3.4.tar.gz) = 7a9726768ab0b75ce4b899ab8012f61bdf9926af741aafdc46876fbf496aa4a9
-SIZE (bld-0.3.4.tar.gz) = 74270
diff --git a/net/bld/files/bld.in b/net/bld/files/bld.in
deleted file mode 100644
index e8805d4739e9..000000000000
--- a/net/bld/files/bld.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: bld
-# REQUIRE: LOGIN
-# BEFORE: mail
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable bld:
-#
-#bld_enable="YES"
-#
-# See bld(8) for flags
-#
-
-. /etc/rc.subr
-
-name="bld"
-rcvar=bld_enable
-
-load_rc_config $name
-
-: ${bld_enable:-"NO"}
-: ${bld_flags:-"-u bld -g bld"}
-
-command="%%PREFIX%%/sbin/bld"
-extra_commands="reload"
-required_dirs=/var/run/bld
-
-run_rc_command "$1"
diff --git a/net/bld/files/patch-aa b/net/bld/files/patch-aa
deleted file mode 100644
index a1d4c0d8336b..000000000000
--- a/net/bld/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Thu May 18 17:31:03 2006
-+++ Makefile.in	Thu May 18 17:31:45 2006
-@@ -52,6 +52,10 @@
- 	    && (cd $(DESTDIR)$(sbindir) && ln -s $(SUBMITNAME) $(INSERTNAME)) \
- 	    && (cd $(DESTDIR)$(sbindir) && ln -s $(SUBMITNAME) $(DECRNAME))
- 	strip $(DESTDIR)$(sbindir)/$(SUBMITNAME)
-+	cp utils/bld-pf_policy.pl $(DESTDIR)/$(sbindir)
-+	cp utils/bld-pf_log.pl $(DESTDIR)/$(sbindir)
-+	[ -d $(DESTDIR)$(sysconfdir) ] || mkdir -p $(DESTDIR)$(sysconfdir)
-+	cp bld.conf.sample $(DESTDIR)/$(sysconfdir)
- 	[ -d $(DESTDIR)$(mandir)/man8 ] || mkdir -p $(DESTDIR)$(mandir)/man8
- 	$(GZIP) -c bld.8 > $(DESTDIR)$(mandir)/man8/bld.8.gz
- 	$(GZIP) -c bldread.8 > $(DESTDIR)$(mandir)/man8/bldread.8.gz
diff --git a/net/bld/files/patch-ab b/net/bld/files/patch-ab
deleted file mode 100644
index 4f18a4d2cb46..000000000000
--- a/net/bld/files/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
---- bld.conf.sample.orig	Thu May 18 17:32:56 2006
-+++ bld.conf.sample	Thu May 18 17:33:33 2006
-@@ -26,10 +26,10 @@
- #log_level=1
- 
- ## User to run as
--#user=
-+#user=bld
- 
- ## Group to run as
--#group=
-+#group=bld
- 
- ## Client timeout
- #client_timeout=60
diff --git a/net/bld/files/patch-ac b/net/bld/files/patch-ac
deleted file mode 100644
index 65667ad83db2..000000000000
--- a/net/bld/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Fix build on 4.x reorganizing #include headers
-#
-
---- client.c.orig	Wed May 31 14:23:30 2006
-+++ client.c	Wed May 31 14:23:45 2006
-@@ -24,11 +24,12 @@
-  * SUCH DAMAGE.
-  *
-  */
-+#include <stdio.h>
-+#include <unistd.h>
- #include <ctype.h>
- #include <sys/select.h>
- #include <sys/time.h>
- #include <sys/types.h>
--#include <unistd.h>
- #include <string.h>
- #include <errno.h>
- #include "options.h"
diff --git a/net/bld/pkg-descr b/net/bld/pkg-descr
deleted file mode 100644
index 57df966e5c53..000000000000
--- a/net/bld/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-BLD stands for "blacklist daemon" and is intended to serve a
-blacklist.  The blacklist is built by simply inserting IP addresses
-or by using submission rate limits based on a maximum number of
-submissions of the same IP address within a minimum time interval.
-You can build a BLD cluster by configuring the daemon to notify
-other similar daemon(s) every time an IP address is added to the
-blacklist.  BLD was primarily designed to fight against dictionnary-based
-spams (by making the MTA report to BLD any host that tries to send
-a mail to an unknown user) but can be used by any program.
-
-See homepage for more infos:
-
-WWW: http://www.online.redhate.org/bld/
-
-Olivier Beyssac <obld@r14.freenix.org>
diff --git a/net/bld/pkg-install b/net/bld/pkg-install
deleted file mode 100644
index fbd5350d4787..000000000000
--- a/net/bld/pkg-install
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/bin/sh
-
-if [ $2 != "POST-INSTALL" ]
-    then
-    exit
-fi
-
-varrun=/var/run/bld
-logfile=/var/log/bld.log
-user=bld
-group=bld
-newsyslog_conf=/etc/newsyslog.conf
-syslog_conf=/etc/syslog.conf
-syslog_pid=/var/run/syslog.pid
-nonexistent=/nonexistent
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-	read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-	answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-	answer=$(ask "${question}" "${dflt}")
-	case "${answer}" in
-	    [Yy]*)		return 0;;
-[Nn]*)		return 1;;
-esac
-echo "Please answer yes or no."
-done
-}
-
-make_account() {
-    local u g gcos homeopt home
-
-    u=$1
-    g=$2
-    gcos=$3
-    homeopt=${4:+"-d $4"}
-
-    if pw group show "${g}" >/dev/null 2>&1; then
-	echo "You already have a group \"${g}\", so I will use it."
-    else
-	echo "You need a group \"${g}\"."
-	pw groupadd ${g} || exit
-	echo "Done."
-    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}\"."
-	pw useradd ${u} -g ${g} -h - ${homeopt} \
-	    -s $nonexistent -c "${gcos}" || exit
-	echo "Done."
-    fi
-
-    if [ x"$homeopt" = x ]; then
-	eval home=~${u}
-	if [ ! -d "${home}" ]; then
-	    mkdir -p ${home}/.cvsup || exit
-	    touch ${home}/.cvsup/auth || exit
-	    chown -R ${u}:${g} ${home} || exit
-	    chmod -R go= ${home} || exit
-	fi
-    fi
-}
-
-if [ ! -d "${varrun}" ]
-    then
-    mkdir ${varrun} || exit
-fi
-
-echo ""
-make_account ${user} ${group} "Blacklist Daemon" "$nonexistent"
-chmod 700 ${varrun}
-chown bld ${varrun}
-
-if grep -q "^[^#]*${facility}.*$logfile" $syslog_conf; then
-    echo -n "It looks like you already have some logging set up, so I "
-    echo "will use it."
-else
-    echo "Setting up server logging in \"$syslog_conf\"."
-    cat <<EOF >>$syslog_conf
-!bld
-*.*						$logfile
-EOF
-
-if [ ! -f $logfile ]; then
-    echo "Creating \"$logfile\"."
-    cp /dev/null $logfile
-fi
-
-if [ -f $syslog_pid ]; then
-    echo "Giving syslogd a kick in the pants."
-    kill -HUP $(cat $syslog_pid)
-fi
-
-echo "Adding bld log entry to \"$newsyslog_conf\"."
-cat <<EOF >>$newsyslog_conf
-$logfile			664  7    *    24    Z
-EOF
-echo "Done."
-fi
-
-# Compatibility from v0.2.4 port
-for i in bld_acl.conf bld_whitelist.conf
-do
-  if [ -f ${PKG_PREFIX}/etc/$i ]
-      then
-      if [ -f ${PKG_PREFIX}/etc/bld/$i ]
-	  then
-	  echo "WARNING: You have a $i configuration file in two directories:"
-	  echo "${PKG_PREFIX}/etc and ${PKG_PREFIX}/etc/bld"
-	  echo "You must use ${PREFIX}/etc/bld/$i"
-      else
-	  echo "You seem to have a $i configuration file in ${PKG_PREFIX}/etc"
-	  echo "Copying it to ${PKG_PREFIX}/etc/bld"
-	  cp ${PKG_PREFIX}/etc/$i ${PKG_PREFIX}/etc/bld
-	  echo "You should clean the old ${PKG_PREFIX}/etc/$i"
-      fi
-  fi
-done
diff --git a/net/bld/pkg-plist b/net/bld/pkg-plist
deleted file mode 100644
index 1558e19c0a8b..000000000000
--- a/net/bld/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-sbin/bld
-sbin/bldsubmit
-sbin/bldread
-sbin/bldquery
-sbin/bldinsert
-sbin/blddecr
-sbin/bld-mrtg.pl
-sbin/bld-pf_policy
-sbin/bld-pf_policy.pl
-sbin/bld-pf_log.pl
-sbin/bld-will_spam_for_food.pl
-etc/bld/bld.conf.sample
-@dirrmtry etc/bld
-@dirrmtry /var/run/bld
diff --git a/net/click/Makefile b/net/click/Makefile
deleted file mode 100644
index dce3ce94a951..000000000000
--- a/net/click/Makefile
+++ /dev/null
@@ -1,228 +0,0 @@
-# Created by: gnn
-# $FreeBSD$
-
-# XXX: TODO: fix kernel module
-
-PORTNAME=	click
-PORTVERSION=	1.5.0
-CATEGORIES=	net
-MASTER_SITES=	http://www.read.cs.ucla.edu/click/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The Click Modular Router
-
-USES=		perl5 gmake
-USE_PERL5=	build
-GNU_CONFIGURE=	yes
-
-INC_BASE?=	/usr/include
-
-CONFIGURE_ARGS+=	--disable-linuxmodule
-CONFIGURE_ARGS+=	--enable-nanotimestamp
-
-MANCOMPRESSED=	no
-INFO=	click
-MAN1=	click.1 click-align.1 click-combine.1 click-devirtualize.1 \
-	click-fastclassifier.1 click-flatten.1 click-install.1 \
-	click-mkmindriver.1 click-pretty.1 click-uncombine.1 click-undead.1 \
-	click-uninstall.1 click-xform.1 testie.1
-MAN5=	click.5
-MAN7=	elementdoc.7
-MAN8=	click.o.8
-MANN=	FTPPortMapper.n ARPFaker.n ARPPrint.n ARPQuerier.n ARPResponder.n \
-	elements-click.n ChangeUID.n \
-	EnsureEther.n EtherEncap.n EtherMirror.n HostEtherFilter.n \
-	CheckARPHeader.n DirectIPLookup.n \
-	RFC2507Comp.n RFC2507Decomp.n \
-	CheckICMPHeader.n ICMPError.n ICMPPingResponder.n ICMPPingRewriter.n \
-	ICMPRewriter.n CheckIPHeader.n CheckIPHeader2.n \
-	DecIPTTL.n FixIPSrc.n FromSocket.n GetIPAddress.n ICMPPingEncap.n \
-	ICMPPingSource.n IPAddrRewriter.n IPAddrPairRewriter.n IPClassifier.n \
-	IPEncap.n IPFilter.n IPFragmenter.n IPGWOptions.n IPInputCombo.n \
-	IPNameInfo.n \
-	IPMirror.n IPOutputCombo.n IPPrint.n IPRateMonitor.n IPRewriterPatterns.n \
-	KernelTun.n LinearIPLookup.n LinkUnqueue.n \
-	MarkIPCE.n MarkIPHeader.n Message.n MixedQueue.n NotifierQueue.n \
-	PaintSwitch.n PortInfo.n RIPSend.n RandomSwitch.n RangeIPLookup.n \
-	RoundRobinIPMapper.n SetAnnoByte.n SetIPAddress.n SetIPChecksum.n SetIPDSCP.n \
-	SetRandIPAddress.n SetUDPChecksum.n SimpleQueue.n StoreData.n \
-	StoreIPAddress.n StripIPHeader.n ToSocket.n UnstripIPHeader.n \
-	Socket.n Script.n Truncate.n \
-	AddressInfo.n Align.n AlignmentInfo.n AverageCounter.n \
-	BandwidthMeter.n BandwidthShaper.n Burster.n BandwidthRatedSplitter.n \
-	BandwidthRatedUnqueue.n CheckCRC32.n CheckLength.n CheckPaint.n \
-	Classifier.n CompareBlock.n Counter.n DelayShaper.n DelayUnqueue.n \
-	Discard.n DiscardNoFree.n DriverManager.n DropBroadcasts.n DRRSched.n \
-	Error.n FrontDropQueue.n HashSwitch.n Idle.n \
-	InfiniteSource.n Meter.n MSQueue.n Null.n PushNull.n PullNull.n \
-	Null1.n \
-	Paint.n PaintTee.n PokeHandlers.n Print.n PrioSched.n \
-	PullSwitch.n Queue.n QuitWatcher.n \
-	RandomBitErrors.n RandomSource.n RatedSource.n \
-	RatedSplitter.n RatedUnqueue.n RED.n RoundRobinSched.n \
-	RoundRobinSwitch.n ScheduleInfo.n SetCRC32.n SetTimestamp.n Shaper.n \
-	SourceIPHashMapper.n SortedIPLookup.n \
-	SpinlockAcquire.n SpinlockInfo.n SpinlockRelease.n StaticPullSwitch.n \
-	StaticSwitch.n StrideSched.n StrideSwitch.n Strip.n Suppressor.n \
-	Switch.n Tee.n PullTee.n TimedSink.n TimedSource.n Unqueue.n \
-	Unqueue2.n Unstrip.n CheckTCPHeader.n CheckUDPHeader.n \
-	DynamicUDPIPEncap.n IPRewriter.n SetTCPChecksum.n TCPRewriter.n \
-	UDPIPEncap.n ChatterSocket.n ControlSocket.n FromDevice.u.n \
-	FromDump.n KernelTap.n KernelHandlerProxy.n \
-	ToDevice.u.n ToDump.n elements.n AdaptiveRED.n IPReassembler.n \
-	IPRouteTable.n StaticIPLookup.n LinuxIPLookup.n RadixIPLookup.n \
-	RandomSample.n SetPacketType.n StripToNetworkHeader.n ProgressBar.n
-
-CONFDIR=	${PREFIX}/etc/click/conf
-
-OPTIONS_DEFINE=		ANALYSIS_ELEMS ETHERSWITCH_ELEMS GRID_ELEMS \
-			IPSEC_ELEMS IPV6_ELEMS KERNEL_MODULE LOCAL_ELEMS \
-			NS_ELEMS RADIO_ELEMS USERCLICK WIFI_ELEMS XML_EXPAT
-OPTIONS_DEFAULT=	USERCLICK
-ANALYSIS_ELEMS_DESC=	Build network analysis elements
-ETHERSWITCH_ELEMS_DESC=	Build etherswitch elements
-GRID_ELEMS_DESC=	Build Grid elements (see FAQ)
-IPSEC_ELEMS_DESC=	Build IPSEC elements
-IPV6_ELEMS_DESC=	Build IPv6 elements (EXPERIMENTAL)
-KERNEL_MODULE_DESC=	Build BSD kernel module (BROKEN)
-LOCAL_ELEMS_DESC=	Build local elements
-NS_ELEMS_DESC=		Build NS elements (EXPERIMENTAL)
-RADIO_ELEMS_DESC=	Build radio elements (EXPERIMENTAL)
-USERCLICK_DESC=		Build user-space Click
-WIFI_ELEMS_DESC=	Build Wi-Fi elements
-XML_EXPAT_DESC=		Enable XML support with expat
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MXML_EXPAT}
-CONFIGURE_ARGS+=	--with-expat=${LOCALBASE}
-LIB_DEPENDS=		libexpat.so:${PORTSDIR}/textproc/expat2
-PLIST_SUB+=		XMLCLICK=""
-.else
-PLIST_SUB+=		XMLCLICK="@comment "
-.endif
-
-.if !${PORT_OPTIONS:MUSERCLICK}
-CONFIGURE_ARGS+=	--disable-userlevel
-#.else
-#MANN+=			IPFlowRawSockets.n
-.endif
-
-.if ${PORT_OPTIONS:MKERNEL_MODULE}
-.if !exists(${SRC_BASE}/sys/Makefile)
-IGNORE=		kernel source files required
-.endif
-CONFIGURE_ARGS+=	--enable-bsdmodule				\
-			--with-freebsd=${SRC_BASE}/sys,${INC_BASE}
-.else
-CONFIGURE_ARGS+=	--disable-bsdmodule
-.endif
-
-.if ${PORT_OPTIONS:MANALYSIS_ELEMS}
-CONFIGURE_ARGS+=	--enable-analysis
-MANN+=		AggregateFilter.n TimeSortedSched.n TimeRange.n \
-		FromTcpdump.n ToIPFlowDumps.n AggregateLast.n \
-		SimPacketAnalyzer.n AggregatePaint.n \
-		FromNetFlowSummaryDump.n AggregateFirst.n AggregateCounter.n \
-		FromDAGDump.n StoreTimestamp.n AggregateIPFlows.n \
-		SetTimestampDelta.n FromCapDump.n AggregateIP.n \
-		TimestampAccum.n AnonymizeIPAddr.n AggregateLength.n \
-		FromIPSummaryDump.n ToIPSummaryDump.n AggregateIPAddrPair.n \
-		AggregatePacketCounter.n TimeFilter.n
-.endif
-
-.if ${PORT_OPTIONS:METHERSWITCH_ELEMS}
-CONFIGURE_ARGS+=	--enable-etherswitch
-MANN+=			EtherSwitch.n ListenEtherSwitch.n
-.endif
-
-.if ${PORT_OPTIONS:MGRID_ELEMS}
-CONFIGURE_ARGS+=	--enable-grid
-MANN+=		ACKResponder.n ACKResponder2.n ACKRetrySender.n \
-		ACKRetrySender2.n AiroInfo.n BottleneckMetric.n \
-		CheckGridHeader.n DSDVRouteTable.n DSRArpTable.n \
-		DSRRouteTable.n E2ELossMetric.n ETX2Metric.n ETXMetric.n \
-		EstimateRouterRegion.n FilterByGridHops.n FilterByRange.n \
-		FixDstLoc.n FixSrcLoc.n FloodingLocQuerier.n FromNLANRDump.n \
-		GridEncap.n GridGatewayInfo.n GridHeaderInfo.n \
-		GridLocationInfo.n GridLocationInfo2.n GridLogger.n \
-		GridProbeHandler.n GridProbeReplyReceiver.n \
-		GridProbeSender.n GridProxy.n GridRouteTable.n GridTxError.n \
-		HopcountMetric.n IncrementSeqNo.n LIRMetric.n LinkStat.n \
-		LinkTable.n LinkTestReceiver.n LinkTester.n LinkTracker.n \
-		LocFromFile.n LocQueryResponder.n LocationTable.n \
-		LookupGeographicGridRoute.n LookupLocalGridRoute.n \
-		LookupLocalGridRoute2.n MovementSimulator.n PEP.n \
-		PacketLogger.n PacketLogger2.n PingPong.n PrintGrid.n \
-		SendGridHello.n SendGridLRHello.n SetGridChecksum.n \
-		SimpleLocQuerier.n ThresholdMetric.n UpdateGridRoutes.n \
-		YarvisMetric.n
-.endif
-
-.if ${PORT_OPTIONS:MIPSEC_ELEMS}
-CONFIGURE_ARGS+=	--enable-ipsec
-MANN+=			IPsecAuthSHA1.n IPsecDES.n IPsecESPUnencap.n \
-			IPsecESPEncap.n
-.endif
-
-.if ${PORT_OPTIONS:MLOCAL_ELEMS}
-CONFIGURE_ARGS+=	--enable-local
-.endif
-
-.if ${PORT_OPTIONS:MWIFI_ELEMS}
-CONFIGURE_ARGS+=	--enable-wifi
-MANN+=		FilterPhyErr.n AssociationResponder.n FilterFailures.n \
-		ReadAnno.n PacketStore.n AvailableRates.n \
-		AssociationRequester.n OpenAuthResponder.n \
-		OpenAuthRequeser.n Prism2Encap.n ProbeResponder.n \
-		AutoRateFallback.n ProbeTXRate.n ARPTable.n WepEncap.n \
-		WepDecap.n WifiDecap.n FilterTX.n EtherCount.n \
-		RadiotapDecap.n RadiotapEncap.n WifiFragment.n \
-		BeaconSource.n BeaconTracker.n BeaconScanner.n RXStats.n \
-		WirelessInfo.n PrintTXFeedback.n SetTXRate.n SetTXPower.n \
-		Prism2Decap.n WifiEncap.n WifiDefrag.n MadwifiRate.n \
-		PrintWifi.n WifiSeq.n PushAnno.n WifiDupeFilter.n \
-		ExtraEncap.n ExtraDecap.n AthdescDecap.n AthdescEncap.n
-.endif
-
-#
-# The following Click elements are marked experimental as of 1.5.0.
-#
-
-.if ${PORT_OPTIONS:MIPV6_ELEMS}
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
-.if ${PORT_OPTIONS:MNS_ELEMS}
-CONFIGURE_ARGS+=	--enable-nsclick
-MANN+=			ToSimTrace.n ToSimDevice.u.n FromSimDevice.u.n \
-			EraseIPPayload.n
-PLIST_SUB+=		NSCLICK=""
-.else
-PLIST_SUB+=		NSCLICK="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MRADIO_ELEMS}
-CONFIGURE_ARGS+=	--enable-radio
-MANN+=			RadioSim.n
-.endif
-
-post-install:
-	cd ${PREFIX}/bin && ${STRIP_CMD} click click-align click-check \
-	  click-combine click-uncombine click-devirtualize click-fastclassifier \
-	  click-flatten click-mkmindriver click-undead click-xform
-	@${MKDIR} ${CONFDIR}
-	${INSTALL_DATA} ${WRKSRC}/conf/*.click ${CONFDIR}
-	@${MKDIR} ${CONFDIR}/wifi
-	${INSTALL_DATA} ${WRKSRC}/conf/wifi/*.click ${CONFDIR}/wifi
-	@${ECHO_CMD}
-	@${ECHO_CMD} "----------------------------------------------------"
-	@${ECHO_CMD} "Install complete, to try it out do the following:"
-	@${ECHO_CMD} "cd ${PREFIX}/etc/click/conf"
-	@${ECHO_CMD} "click test.click"
-	@${ECHO_CMD} "You should see some output.  Now go read the papers and manual."
-	@${ECHO_CMD} "----------------------------------------------------"
-	@${ECHO_CMD}
-
-.include <bsd.port.mk>
diff --git a/net/click/distinfo b/net/click/distinfo
deleted file mode 100644
index 30aac8014585..000000000000
--- a/net/click/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (click-1.5.0.tar.gz) = 78b15937147e7d435eea357ccadb1b1c7a23d7f500abc45f2e54eb1803efe0a0
-SIZE (click-1.5.0.tar.gz) = 2924904
diff --git a/net/click/files/patch-configure b/net/click/files/patch-configure
deleted file mode 100644
index c74102b0f94c..000000000000
--- a/net/click/files/patch-configure
+++ /dev/null
@@ -1,53 +0,0 @@
---- configure.orig	Fri May 19 21:50:14 2006
-+++ configure	Fri Oct 13 02:41:33 2006
-@@ -4449,14 +4449,14 @@
- 
- =========================================" >&2;}
-    { (exit 1); exit 1; }; }
--elif test -r $freebsd_includedir/net/if_var.h -a -r $freebsd_srcdir/kern/vnode_if.pl; then
-+elif test -r $freebsd_includedir/net/if_var.h -a -r $freebsd_srcdir/kern/vnode_if.src; then
-   ac_have_bsd_kernel=y
- else
-   { { echo "$as_me:$LINENO: error:
- =========================================
- 
- Can't find $freebsd_includedir/net/if_var.h and/or
--$freebsd_srcdir/kern/vnode_if.pl.  Are you sure $freebsd_srcdir
-+$freebsd_srcdir/kern/vnode_if.src.  Are you sure $freebsd_srcdir
- and $freebsd_includedir contain FreeBSD kernel source?
- 
- =========================================" >&5
-@@ -4464,7 +4464,7 @@
- =========================================
- 
- Can't find $freebsd_includedir/net/if_var.h and/or
--$freebsd_srcdir/kern/vnode_if.pl.  Are you sure $freebsd_srcdir
-+$freebsd_srcdir/kern/vnode_if.src.  Are you sure $freebsd_srcdir
- and $freebsd_includedir contain FreeBSD kernel source?
- 
- =========================================" >&2;}
-@@ -12279,7 +12279,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <sys/param.h>
--#if __FreeBSD_version < 440002 || __FreeBSD_version >= 500000
-+#if __FreeBSD_version < 500000
- #include <NONEXISTENT_FILE>
- #endif
- _ACEOF
-@@ -12330,13 +12330,13 @@
- 	{ echo "$as_me:$LINENO: WARNING:
- =========================================
- 
--Your version of FreeBSD is old.  Click works with FreeBSD 4.5 and later.
-+Your version of FreeBSD is old.  Click works with FreeBSD 5.x and later.
- 
- =========================================" >&5
- echo "$as_me: WARNING:
- =========================================
- 
--Your version of FreeBSD is old.  Click works with FreeBSD 4.5 and later.
-+Your version of FreeBSD is old.  Click works with FreeBSD 5.x and later.
- 
- =========================================" >&2;}
-     fi
diff --git a/net/click/files/patch-configure.in b/net/click/files/patch-configure.in
deleted file mode 100644
index 51bfa1af4101..000000000000
--- a/net/click/files/patch-configure.in
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.in.orig	Fri May 19 21:48:10 2006
-+++ configure.in	Fri Oct 13 02:41:47 2006
-@@ -208,14 +208,14 @@
- are relative.  You must supply absolute paths starting with /.
- 
- =========================================])
--elif test -r $freebsd_includedir/net/if_var.h -a -r $freebsd_srcdir/kern/vnode_if.pl; then
-+elif test -r $freebsd_includedir/net/if_var.h -a -r $freebsd_srcdir/kern/vnode_if.src; then
-   ac_have_bsd_kernel=y
- else
-   AC_MSG_ERROR([
- =========================================
- 
- Can't find $freebsd_includedir/net/if_var.h and/or
--$freebsd_srcdir/kern/vnode_if.pl.  Are you sure $freebsd_srcdir
-+$freebsd_srcdir/kern/vnode_if.src.  Are you sure $freebsd_srcdir
- and $freebsd_includedir contain FreeBSD kernel source?
- 
- =========================================])
-@@ -549,7 +549,7 @@
- 	save_flags="$CPPFLAGS"
- 	CPPFLAGS="$CPPFLAGS -I$freebsd_includedir"
- 	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <sys/param.h>
--#if __FreeBSD_version < 440002 || __FreeBSD_version >= 500000
-+#if __FreeBSD_version < 500000
- #include <NONEXISTENT_FILE>
- #endif]])], ac_cv_freebsd_version=yes, ac_cv_freebsd_version=no)
- 	CPPFLAGS="$save_flags"])
-@@ -560,7 +560,7 @@
- 	AC_MSG_WARN([
- =========================================
- 
--Your version of FreeBSD is old.  Click works with FreeBSD 4.5 and later.
-+Your version of FreeBSD is old.  Click works with FreeBSD 5.x and later.
- 
- =========================================])
-     fi
diff --git a/net/click/files/patch-elements_ip_ipreassembler.cc b/net/click/files/patch-elements_ip_ipreassembler.cc
deleted file mode 100644
index 6c857ca315d5..000000000000
--- a/net/click/files/patch-elements_ip_ipreassembler.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- elements/ip/ipreassembler.cc.orig	2005-12-21 03:24:31.000000000 +0000
-+++ elements/ip/ipreassembler.cc
-@@ -27,6 +27,7 @@
- #include <click/error.hh>
- #include <click/glue.hh>
- #include <click/straccum.hh>
-+#include <cstddef>
- CLICK_DECLS
- 
- #define PACKET_CHUNK(p)		(((PacketInfo *)((p)->all_user_anno_u()))->chunk)
diff --git a/net/click/files/patch-elements_userlevel_socket.cc b/net/click/files/patch-elements_userlevel_socket.cc
deleted file mode 100644
index fab2c5a88911..000000000000
--- a/net/click/files/patch-elements_userlevel_socket.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- elements/userlevel/socket.cc.orig	2006-04-08 16:22:40.000000000 +0000
-+++ elements/userlevel/socket.cc
-@@ -29,6 +29,7 @@
- #include <arpa/inet.h>
- #include <netinet/tcp.h>
- #include <fcntl.h>
-+#include <cstddef>
- #include "socket.hh"
- 
- CLICK_DECLS
diff --git a/net/click/pkg-descr b/net/click/pkg-descr
deleted file mode 100644
index f7abd2708501..000000000000
--- a/net/click/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-This is the port of the Click Modular Router.
-
-From the web page:
-
-Click is a new modular software router for PCs developed by MIT
-LCS's Parallel and Distributed Operating Systems group. Click
-routers are flexible, configurable, and easy to understand at a
-high level. They're also pretty fast (for software routers running
-on commodity hardware); on a 700 MHz Pentium III, a Click IP router
-can handle up to 435,000 64-byte packets a second.
-
-WWW: http://pdos.csail.mit.edu/click/
diff --git a/net/click/pkg-plist b/net/click/pkg-plist
deleted file mode 100644
index 6ba478d6e56a..000000000000
--- a/net/click/pkg-plist
+++ /dev/null
@@ -1,154 +0,0 @@
-bin/click
-bin/click-align
-bin/click-buildtool
-bin/click-check
-bin/click-combine
-bin/click-compile
-bin/click-devirtualize
-bin/click-elem2man
-bin/click-fastclassifier
-bin/click-flatten
-bin/click-mkelemmap
-bin/click-mkmindriver
-bin/click-pretty
-bin/click-uncombine
-bin/click-undead
-bin/click-xform
-bin/click2xml
-bin/testie
-%%XMLCLICK%%bin/xml2click
-etc/click/conf/dnsproxy.click
-etc/click/conf/fake-iprouter.click
-etc/click/conf/fromhost-tunnel.click
-etc/click/conf/grid.click
-etc/click/conf/mazu-nat.click
-etc/click/conf/print-pings.click
-etc/click/conf/sampler.click
-etc/click/conf/simple-dsdv-userlevel.click
-etc/click/conf/test-device.click
-etc/click/conf/test-tun.click
-etc/click/conf/test.click
-etc/click/conf/test2.click
-etc/click/conf/test3.click
-etc/click/conf/thomer-nat.click
-etc/click/conf/udpcount.click
-etc/click/conf/udpgen.click
-etc/click/conf/wifi/access-point.click
-etc/click/conf/wifi/dump.click
-etc/click/conf/wifi/pseudo-ibss.click
-etc/click/conf/wifi/station.click
-include/click/archive.hh
-include/click/atomic.hh
-include/click/bighashmap.cc
-include/click/bighashmap.hh
-include/click/bighashmap_arena.hh
-include/click/bitvector.hh
-include/click/clp.h
-include/click/config-bsdmodule.h
-include/click/config-linuxmodule.h
-include/click/config-ns.h
-include/click/config-userlevel.h
-include/click/config.h
-include/click/confparse.hh
-include/click/crc32.h
-include/click/cxxprotect.h
-include/click/cxxunprotect.h
-include/click/dequeue.cc
-include/click/dequeue.hh
-include/click/driver.hh
-include/click/element.hh
-include/click/elemfilter.hh
-include/click/ewma64.hh
-include/click/error.hh
-include/click/etheraddress.hh
-include/click/ewma.cc
-include/click/ewma.hh
-include/click/gaprate.hh
-include/click/glue.hh
-include/click/handlercall.hh
-include/click/hashmap.cc
-include/click/hashmap.hh
-include/click/ino.hh
-include/click/integers.hh
-include/click/ipaddresslist.hh
-include/click/ip6address.hh
-include/click/ip6flowid.hh
-include/click/ip6table.hh
-include/click/ipaddress.hh
-include/click/ipflowid.hh
-include/click/iptable.hh
-include/click/lexer.hh
-include/click/llrpc.h
-include/click/master.hh
-include/click/nameinfo.hh
-include/click/notifier.hh
-include/click/package.hh
-include/click/packet.hh
-include/click/packet_anno.hh
-include/click/pair.hh
-include/click/pathvars.h
-include/click/perfctr-i586.hh
-include/click/router.hh
-include/click/routerthread.hh
-include/click/simclick.h
-include/click/skbmgr.hh
-include/click/timestamp.hh
-include/click/standard/addressinfo.hh
-include/click/standard/alignmentinfo.hh
-include/click/standard/errorelement.hh
-include/click/standard/portinfo.hh
-include/click/standard/storage.hh
-include/click/standard/scheduleinfo.hh
-include/click/standard/threadsched.hh
-include/click/straccum.hh
-include/click/string.hh
-include/click/sync.hh
-include/click/task.hh
-include/click/timer.hh
-include/click/userutils.hh
-include/click/variableenv.hh
-include/click/vector.cc
-include/click/vector.hh
-include/clicknet/dhcp.h
-include/clicknet/ether.h
-include/clicknet/fddi.h
-include/clicknet/icmp.h
-include/clicknet/icmp6.h
-include/clicknet/ip.h
-include/clicknet/ip6.h
-include/clicknet/llc.h
-include/clicknet/ppp.h
-include/clicknet/radiotap.h
-include/clicknet/rfc1483.h
-include/clicknet/tcp.h
-include/clicknet/udp.h
-include/clicknet/wifi.h
-@dirrm include/clicknet
-include/clicktool/eclasst.hh
-include/clicktool/elementmap.hh
-include/clicktool/elementt.hh
-include/clicktool/etraits.hh
-include/clicktool/lexert.hh
-include/clicktool/lexertinfo.hh
-include/clicktool/processingt.hh
-include/clicktool/routert.hh
-include/clicktool/runparse.hh
-include/clicktool/toolutils.hh
-@unexec rm -rf %D/etc/click 2>&1 >/dev/null || true
-lib/libclick.a
-lib/libclicktool.a
-%%NSCLICK%%lib/libnsclick.so
-%%DATADIR%%/mkinstalldirs
-%%DATADIR%%/config.mk
-%%DATADIR%%/pkg-config.mk
-%%DATADIR%%/pkg-Makefile
-%%DATADIR%%/pkg-userlevel.mk
-%%DATADIR%%/pkg-linuxmodule.mk
-%%DATADIR%%/pkg-linuxmodule-26.mk
-%%DATADIR%%/elementmap.xml
-%%DATADIR%%/srcdir
-%%DATADIR%%/src
-@dirrm include/click/standard
-@dirrm include/click
-@dirrm include/clicktool
-@dirrm %%DATADIR%%
diff --git a/net/cnet/Makefile b/net/cnet/Makefile
deleted file mode 100644
index 48653c4ed1b0..000000000000
--- a/net/cnet/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# Created by: jkh
-# $FreeBSD$
-
-PORTNAME=	cnet
-PORTVERSION=	2.0.10
-PORTREVISION=	2
-CATEGORIES=	net tcl tk
-MASTER_SITES=	http://www.csse.uwa.edu.au/cnet/ \
-		ftp://ftp.giga.net.tw/OS/FreeBSD/distfiles/ \
-		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Networking simulator
-
-LIB_DEPENDS=	libtk84.so:${PORTSDIR}/x11-toolkits/tk84
-
-USE_XORG=	xpm
-USES=		gmake tar:tgz
-ALL_TARGET=	# empty
-MAN1=		cnet.1
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64" || ${ARCH} == "amd64"
-BROKEN=		Does not compile on amd64 or ia64
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|8.3|8.4|g ; \
-		 s|83|84|g' ${WRKSRC}/src/Makefile.freebsd
-	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \
-		 s|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/config.h
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/cnet ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/src/cnet.h ${PREFIX}/include
-	${INSTALL_MAN} ${WRKSRC}/DOC/cnet.man ${PREFIX}/man/man1/cnet.1
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/cnetlib/* ${DATADIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/examples/cnet
-	${INSTALL_DATA} ${WRKSRC}/EXAMPLES/* ${PREFIX}/share/examples/cnet
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/DOC/*.html ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}/images
-	${INSTALL_DATA} ${WRKSRC}/DOC/images/* ${DOCSDIR}/images
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/cnet/distinfo b/net/cnet/distinfo
deleted file mode 100644
index a1f9c5bd969f..000000000000
--- a/net/cnet/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cnet-2.0.10.tgz) = 7b1e720179b7316d97b8b947155b261dda7ddfd01ff18fb04139c33f4a35bfcb
-SIZE (cnet-2.0.10.tgz) = 1158887
diff --git a/net/cnet/pkg-descr b/net/cnet/pkg-descr
deleted file mode 100644
index 6196ce2b8372..000000000000
--- a/net/cnet/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-cnet is a networking simulator which enables experimentation with
-various data-link layer, network layer, routing and transport layer
-networking protocols.  It has been specifically developed for, and
-used in, undergraduate computer networking courses by thousands of
-students since 1991.
-
-WWW: http://www.csse.uwa.edu.au/cnet/
diff --git a/net/cnet/pkg-plist b/net/cnet/pkg-plist
deleted file mode 100644
index 0ad532eb7ddc..000000000000
--- a/net/cnet/pkg-plist
+++ /dev/null
@@ -1,117 +0,0 @@
-bin/cnet
-include/cnet.h
-%%DATADIR%%/australia.gif
-%%DATADIR%%/australia1.gif
-%%DATADIR%%/australia2.gif
-%%DATADIR%%/bsd.gif
-%%DATADIR%%/cnet.h
-%%DATADIR%%/cnet.tcl
-%%DATADIR%%/cnet64bits.h
-%%DATADIR%%/dead.gif
-%%DATADIR%%/europe1.gif
-%%DATADIR%%/hurd.gif
-%%DATADIR%%/linux.gif
-%%DATADIR%%/mac.gif
-%%DATADIR%%/next.gif
-%%DATADIR%%/os2.gif
-%%DATADIR%%/palm.gif
-%%DATADIR%%/paused.gif
-%%DATADIR%%/repair.gif
-%%DATADIR%%/router.gif
-%%DATADIR%%/sgi.gif
-%%DATADIR%%/sun.gif
-%%DATADIR%%/usa1.gif
-%%DATADIR%%/usa2.gif
-%%DATADIR%%/usa3.gif
-%%DATADIR%%/windows.gif
-%%DATADIR%%/world1.gif
-%%DATADIR%%/zap.gif
-%%PORTDOCS%%%%DOCSDIR%%/application.html
-%%PORTDOCS%%%%DOCSDIR%%/attributes.html
-%%PORTDOCS%%%%DOCSDIR%%/changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/datatypes.html
-%%PORTDOCS%%%%DOCSDIR%%/drawframes.html
-%%PORTDOCS%%%%DOCSDIR%%/ethernets.html
-%%PORTDOCS%%%%DOCSDIR%%/eventdriven.html
-%%PORTDOCS%%%%DOCSDIR%%/eventfuncs.html
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/images/UWAsmall.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/australia.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/australia1.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/australia2.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/costs.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/drawframes.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/error1.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/ethernet1.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/ethernet2.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/europe.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/layers.fig
-%%PORTDOCS%%%%DOCSDIR%%/images/layers.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/mainlink.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/mainstdio.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/mainwindow.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/multinode.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/new.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/purple-line.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/purplefade.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/random12.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/skey5.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/stallings6.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/stallings7.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/tracing1.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/tracing2.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/updated.gif
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/int64.html
-%%PORTDOCS%%%%DOCSDIR%%/introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/options.html
-%%PORTDOCS%%%%DOCSDIR%%/otherfuncs.html
-%%PORTDOCS%%%%DOCSDIR%%/physical.html
-%%PORTDOCS%%%%DOCSDIR%%/themodel.html
-%%PORTDOCS%%%%DOCSDIR%%/timers.html
-%%PORTDOCS%%%%DOCSDIR%%/topology.html
-%%PORTDOCS%%%%DOCSDIR%%/tracing.html
-%%PORTDOCS%%%%DOCSDIR%%/walkthrough.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/AUSTRALIA.MAP
-%%PORTDOCS%%%%EXAMPLESDIR%%/CLICK
-%%PORTDOCS%%%%EXAMPLESDIR%%/ETHERTEST
-%%PORTDOCS%%%%EXAMPLESDIR%%/EUROPE.MAP
-%%PORTDOCS%%%%EXAMPLESDIR%%/FLOODING1
-%%PORTDOCS%%%%EXAMPLESDIR%%/FLOODING2
-%%PORTDOCS%%%%EXAMPLESDIR%%/FLOODING3
-%%PORTDOCS%%%%EXAMPLESDIR%%/KEYBOARD
-%%PORTDOCS%%%%EXAMPLESDIR%%/LINKSTATE
-%%PORTDOCS%%%%EXAMPLESDIR%%/MAXFLOW
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/README.flooding
-%%PORTDOCS%%%%EXAMPLESDIR%%/STOPANDWAIT
-%%PORTDOCS%%%%EXAMPLESDIR%%/T2
-%%PORTDOCS%%%%EXAMPLESDIR%%/TICKTOCK
-%%PORTDOCS%%%%EXAMPLESDIR%%/TOPOLOGY.2a
-%%PORTDOCS%%%%EXAMPLESDIR%%/TOPOLOGY.2b
-%%PORTDOCS%%%%EXAMPLESDIR%%/TOPOLOGY.2c
-%%PORTDOCS%%%%EXAMPLESDIR%%/WORLD
-%%PORTDOCS%%%%EXAMPLESDIR%%/WORLD.MAP
-%%PORTDOCS%%%%EXAMPLESDIR%%/click.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/ethertest.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/flooding.gp
-%%PORTDOCS%%%%EXAMPLESDIR%%/flooding1.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/flooding1.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/flooding2.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/flooding2.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/flooding3.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/flooding3.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/keyboard.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/linkstate.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/nltable.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/nltable.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/protocol.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/result.file
-%%PORTDOCS%%%%EXAMPLESDIR%%/stopandwait.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/ticktock.c
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
diff --git a/net/cnupm/Makefile b/net/cnupm/Makefile
deleted file mode 100644
index 577d8febaf77..000000000000
--- a/net/cnupm/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Created by: Dennis S.Davidoff <null@1system.ru>
-# $FreeBSD$
-
-PORTNAME=	cnupm
-PORTVERSION=	3.12
-CATEGORIES=	net ipv6
-MASTER_SITES=	http://pdp-11.org.ru/~form/cnupm/files/ \
-		ftp://cvs.1system.ru/pub/local/src/cnupm/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The BPF Traffic Collector (IPv4/IPv6)
-
-MAKE_ENV+=	BINDIR="${PREFIX}/sbin" \
-		MANDIR="${MANPREFIX}/man/man"
-
-USE_RC_SUBR=	cnupm
-MAN8=		cnupm.8 cnupmstat.8
-MANCOMPRESSED=	yes
-
-CNUPM_OWN?=	cnupm
-CNUPM_GRP?=	cnupm
-
-PW=		/usr/sbin/pw
-
-PLIST_SUB+=	CNUPM_OWN="${CNUPM_OWN}" CNUPM_GRP="${CNUPM_GRP}"
-
-PORTDOCS=	README
-
-NO_STAGE=	yes
-post-install:
-	${PW} groupshow ${CNUPM_GRP} 2>/dev/null || ${PW} groupadd \
-		-n ${CNUPM_GRP}
-	${PW} usershow ${CNUPM_OWN} 2>/dev/null || ${PW} useradd \
-		-n ${CNUPM_OWN} -c 'Cnupm traffic collector' \
-		-g ${CNUPM_GRP} -s /sbin/nologin
-	${INSTALL} -o ${CNUPM_OWN} -g ${CNUPM_GRP} -m 750 -d ${PREFIX}/var/cnupm
-	${PW} usermod -n ${CNUPM_OWN} -d ${PREFIX}/var/cnupm
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for docs in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
-.endfor
-.endif
-
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/net/cnupm/distinfo b/net/cnupm/distinfo
deleted file mode 100644
index 33ae1084f705..000000000000
--- a/net/cnupm/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cnupm-3.12.tar.gz) = 32f9c23eb7f32507a6a3963600be89269dd2392e57911e8fc30a3d768f6662a1
-SIZE (cnupm-3.12.tar.gz) = 36287
diff --git a/net/cnupm/files/cnupm.in b/net/cnupm/files/cnupm.in
deleted file mode 100644
index 2a9a33852020..000000000000
--- a/net/cnupm/files/cnupm.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-#
-# Add the following lines to /etc/rc.conf to enable rsyncd:
-#
-# cnupm_enable="YES"
-# cnupm_ifaces="rl0"	# Change this with your interface!
-# cnupm_flags=""	# Set this one to override default flags
-#
-# See cnupm(8) for flags
-#
-
-. /etc/rc.subr
-
-name=cnupm
-rcvar=cnupm_enable
-command=%%PREFIX%%/sbin/cnupm
-cnupm_flags="-ep -f inet -u cnupm"
-
-load_rc_config ${name}
-
-cnupm_enable=${cnupm_enable:-"NO"}
-
-case ${cnupm_enable} in
-[Yy][Ee][Ss])
-	if [ -z ${cnupm_iface} ]; then
-		err 1 "cnupm_iface is not set - edit /etc/rc.conf"
-	fi
-esac
-
-cnupm_flags="-i ${cnupm_iface} ${cnupm_flags:-""}"
-pidfile=~${name}/${name}-${cnupm_iface}.pid
-
-run_rc_command "$1"
diff --git a/net/cnupm/files/patch-cnupm_aggr_port.c b/net/cnupm/files/patch-cnupm_aggr_port.c
deleted file mode 100644
index c717a3bd7fa2..000000000000
--- a/net/cnupm/files/patch-cnupm_aggr_port.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- cnupm/aggr_port.c.orig	2012-11-30 15:29:58.000000000 +0100
-+++ cnupm/aggr_port.c	2012-11-30 15:30:30.000000000 +0100
-@@ -120,7 +120,6 @@
- {
- 	struct aggr_port_entry *ap;
- 
--	port = port;
- 	RB_FOREACH(ap, aggr_port_tree, &aggr_port_tree)
- 		if (port >= ap->ape_first && port <= ap->ape_last)
- 			return (ap->ape_port != 0 ? ap->ape_port : port);
diff --git a/net/cnupm/pkg-descr b/net/cnupm/pkg-descr
deleted file mode 100644
index 5f6eeae057ff..000000000000
--- a/net/cnupm/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-The cnupm is an IP/IPv6 traffic collector daemon; it listens on a network
-interface for IP/IPv6 packets that match the boolean expression (see
-tcpdump(8) for more information) and collects the following statistics:
-
-     o   address family (INET/INET6)
-     o   IP/IPv6 protocol number
-     o   source IP/IPv6 address
-     o   source TCP/UDP port
-     o   destination IP/IPv6 address
-     o   destination TCP/UDP port
-     o   total number of bytes trasferred
-
-WWW: http://pdp-11.org.ru/~form/cnupm/
diff --git a/net/cnupm/pkg-message b/net/cnupm/pkg-message
deleted file mode 100644
index 6dc982823174..000000000000
--- a/net/cnupm/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
-************************************************************
-
-Add the following lines to /etc/rc.conf to enable cnupm:
-
-cnupm_enable="YES"
-cnupm_iface="rl0"	# Change this with your interface!
-#cnupm_flags=""		# Set this one to override default flags
-
-See cnupm(8) for flags
-
-************************************************************
diff --git a/net/cnupm/pkg-plist b/net/cnupm/pkg-plist
deleted file mode 100644
index 6de565b3dd37..000000000000
--- a/net/cnupm/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-sbin/cnupm
-sbin/cnupmstat
-@exec pw groupshow %%CNUPM_GRP%% 2>/dev/null || pw groupadd -n %%CNUPM_GRP%%
-@exec pw usershow %%CNUPM_OWN%% 2>/dev/null || pw useradd -n %%CNUPM_OWN%% -c 'Cnupm traffic collector' -g %%CNUPM_GRP%% -s /sbin/nologin
-@exec install -o %%CNUPM_OWN%% -g %%CNUPM_GRP%% -m 750 -d %D/var/cnupm
-@exec pw usermod -n %%CNUPM_OWN%% -d %D/var/cnupm
-@dirrmtry var/cnupm
-@exec mkdir -p %D/var
-@dirrmtry var
diff --git a/net/ct/Makefile b/net/ct/Makefile
deleted file mode 100644
index 0a3907fc941b..000000000000
--- a/net/ct/Makefile
+++ /dev/null
@@ -1,775 +0,0 @@
-# Created by: TANAKA Takashi <tanaka@tahi.org>
-# $FreeBSD$
-
-PORTNAME=	ct
-PORTVERSION=	2.1.2
-PORTREVISION=	1
-CATEGORIES=	net ipv6
-MASTER_SITES=	http://www.tahi.org/release/ct/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	IPv6 Conformance Test Kit
-
-LICENSE=	BSD
-LICENSE_FILE=	${WRKSRC}/COPYRIGHT
-
-RUN_DEPENDS=	${LOCALBASE}/v6eval/bin/pktbuf:${PORTSDIR}/net/v6eval
-
-NO_BUILD=	yes
-USES=	shebangfix perl5
-SHEBANG_FILES=	\
-	dd/BEGIN.seq \
-	dd/DDDHCPv6.seq \
-	dd/DDWellKnown.seq \
-	dd/nameserver.pl \
-	default-addr-select/BEGIN.seq \
-	default-addr-select/DstSelectExample4.seq \
-	default-addr-select/DstSelectExample6.seq \
-	default-addr-select/DstSelectExample7.seq \
-	default-addr-select/DstSelectExample8.seq \
-	default-addr-select/DstSelectExample9.seq \
-	default-addr-select/DstSelectRule10.seq \
-	default-addr-select/DstSelectRule2.seq \
-	default-addr-select/DstSelectRule2_deprecated.seq \
-	default-addr-select/DstSelectRule3.seq \
-	default-addr-select/DstSelectRule5.seq \
-	default-addr-select/DstSelectRule6.seq \
-	default-addr-select/END.seq \
-	default-addr-select/DstSelectRule7.seq \
-	default-addr-select/DstSelectRule8.seq \
-	default-addr-select/DstSelectRule9.seq \
-	default-addr-select/SrcSelectExample1.seq \
-	default-addr-select/SrcSelectExample10.seq \
-	default-addr-select/SrcSelectExample5.seq \
-	default-addr-select/SrcSelectExample6.seq \
-	default-addr-select/SrcSelectExample7.seq \
-	default-addr-select/SrcSelectExample9.seq \
-	default-addr-select/SrcSelectRule1.seq \
-	default-addr-select/SrcSelectRule1_deprecated.seq \
-	default-addr-select/SrcSelectRule2.seq \
-	default-addr-select/SrcSelectRule2_TempAddr.seq \
-	default-addr-select/SrcSelectRule2_deprecated.seq \
-	default-addr-select/SrcSelectRule3.seq \
-	default-addr-select/SrcSelectRule3_TempAddr.seq \
-	default-addr-select/SrcSelectRule5.seq \
-	default-addr-select/SrcSelectRule5_TempAddr.seq \
-	default-addr-select/SrcSelectRule5_deprecated.seq \
-	default-addr-select/SrcSelectRule6.seq \
-	default-addr-select/SrcSelectRule7.seq \
-	default-addr-select/SrcSelectRule8.seq \
-	icmp/BEGIN.seq \
-	icmp/Dst_Unreach_0_Global.seq \
-	icmp/Dst_Unreach_3_Global.seq \
-	icmp/Dst_Unreach_4_Global.seq \
-	icmp/Dst_Unreach_4_Link-Local.seq \
-	icmp/Echo_Checksum.seq \
-	icmp/Echo_Global.seq \
-	icmp/Echo_Link-Local.seq \
-	icmp/Echo_Multicast.seq \
-	icmp/Err_Msg_Size_Dst_Unreach_4.seq \
-	icmp/Err_Msg_Size_P_Problem.seq \
-	icmp/Err_Msg_Size_Time_Exc.seq \
-	icmp/FH_Pre.seq \
-	icmp/P_Problem_Global.seq \
-	icmp/P_Problem_Link-Local.seq \
-	icmp/Pkt_Too_Big.seq \
-	icmp/Time_Exc_Global.seq \
-	icmp/Time_Exc_Link-Local.seq \
-	icmp/To_ICMPErr_Dst_Unreach_3.seq \
-	icmp/To_ICMPErr_Dst_Unreach_4.seq \
-	icmp/To_ICMPErr_Time_Exc.seq \
-	icmp/To_Multi_Dst_Unreach_4.seq \
-	icmp/To_Multi_Time_Exc.seq \
-	icmp/Unknown_Infomsg.seq \
-	icmp/destination_unreachable_code_two.seq \
-	ipsec/BEGIN.seq \
-	ipsec/HTR_A_In_2SA_DspiDipsrc.seq \
-	ipsec/HTR_A_In_2SA_DspiSipsrc.seq \
-	ipsec/HTR_A_In_DM_DSTH_optdata.seq \
-	ipsec/HTR_A_In_DM_DSTH_optlen.seq \
-	ipsec/HTR_A_In_DM_DSTH_opttype.seq \
-	ipsec/HTR_A_In_DM_HBHH_optdata.seq \
-	ipsec/HTR_A_In_DM_HBHH_optlen.seq \
-	ipsec/HTR_A_In_DM_HBHH_opttype.seq \
-	ipsec/HTR_A_In_DM_IPv6H_dst.seq \
-	ipsec/HTR_A_In_DM_IPv6H_hlim.seq \
-	ipsec/HTR_A_In_DM_IPv6H_src.seq \
-	ipsec/HTR_A_In_DM_Payload.seq \
-	ipsec/HTR_A_In_DM_RH_ipv6h_dst.seq \
-	ipsec/HTR_A_In_DM_RH_lastaddr.seq \
-	ipsec/HTR_A_In_Fragment.seq \
-	ipsec/HTR_A_In_hmacmd5.seq \
-	ipsec/HTR_A_In_hmacsha1.seq \
-	ipsec/HTR_A_Input.seq \
-	ipsec/HTR_A_Out_2SA_DspiDipdst.seq \
-	ipsec/HTR_A_Out_2SA_SspiDipdst.seq \
-	ipsec/HTR_A_Out_Fragment.seq \
-	ipsec/HTR_A_Out_hmacmd5.seq \
-	ipsec/HTR_A_Out_hmacsha1.seq \
-	ipsec/HTR_A_Output.seq \
-	ipsec/HTR_C_In_2SA_SspiSipsrcDproto.seq \
-	ipsec/HTR_C_In_3descbc_SPD_discard_none.seq \
-	ipsec/HTR_C_In_SPD_discard_none.seq \
-	ipsec/HTR_C_In_ah_esp.seq \
-	ipsec/HTR_C_In_descbc_SPD_discard_none.seq \
-	ipsec/HTR_C_In_rijndaelcbc_SPD_discard_none.seq \
-	ipsec/HTR_C_Out_3descbc_SPD_discard_none.seq \
-	ipsec/HTR_C_Out_SPD_discard_none.seq \
-	ipsec/HTR_C_Out_ah_esp.seq \
-	ipsec/HTR_C_Out_descbc_SPD_discard_none.seq \
-	ipsec/HTR_C_Out_rijndaelcbc_SPD_discard_none.seq \
-	ipsec/HTR_E_In_2SA_DspiDipsrc_3descbc.seq \
-	ipsec/HTR_E_In_2SA_DspiDipsrc_descbc.seq \
-	ipsec/HTR_E_In_2SA_DspiDipsrc_rijndaelcbc.seq \
-	ipsec/HTR_E_In_2SA_DspiSipsrc_3descbc.seq \
-	ipsec/HTR_E_In_2SA_DspiSipsrc_descbc.seq \
-	ipsec/HTR_E_In_2SA_DspiSipsrc_rijndaelcbc.seq \
-	ipsec/HTR_E_In_3descbc.seq \
-	ipsec/HTR_E_In_3descbc_hmacmd5.seq \
-	ipsec/HTR_E_In_3descbc_hmacsha1.seq \
-	ipsec/HTR_E_In_3descbc_hmacsha2_256.seq \
-	ipsec/HTR_E_In_AuthKey_hmacmd5.seq \
-	ipsec/HTR_E_In_AuthKey_hmacsha1.seq \
-	ipsec/HTR_E_In_AuthKey_hmacsha2_256.seq \
-	ipsec/HTR_E_In_DuplicateSequence.seq \
-	ipsec/HTR_E_In_EncryptKey_3descbc.seq \
-	ipsec/HTR_E_In_EncryptKey_descbc.seq \
-	ipsec/HTR_E_In_EncryptKey_rijndaelcbc.seq \
-	ipsec/HTR_E_In_Fragment_hmacmd5.seq \
-	ipsec/HTR_E_In_Fragment_hmacsha1.seq \
-	ipsec/HTR_E_In_Fragment_hmacsha2_256.seq \
-	ipsec/HTR_E_In_InvalidPadding_3descbc.seq \
-	ipsec/HTR_E_In_InvalidPadding_descbc.seq \
-	ipsec/HTR_E_In_InvalidPadding_rijndaelcbc.seq \
-	ipsec/HTR_E_In_LifetimeSAByte.seq \
-	ipsec/HTR_E_In_LifetimeSATime.seq \
-	ipsec/HTR_E_In_PadLen255_3descbc.seq \
-	ipsec/HTR_E_In_PadLen255_descbc.seq \
-	ipsec/HTR_E_In_PadLen255_rijndaelcbc.seq \
-	ipsec/HTR_E_In_Padding_3descbc.seq \
-	ipsec/HTR_E_In_Padding_3descbc_hmacsha1.seq \
-	ipsec/HTR_E_In_Padding_descbc.seq \
-	ipsec/HTR_E_In_Padding_3descbc_hmacsha2_256.seq \
-	ipsec/HTR_E_In_Padding_descbc_hmacsha1.seq \
-	ipsec/HTR_E_In_Padding_descbc_hmacsha2_256.seq \
-	ipsec/HTR_E_In_Padding_null_hmacmd5.seq \
-	ipsec/HTR_E_In_Padding_null_hmacsha1.seq \
-	ipsec/HTR_E_In_Padding_null_hmacsha2_256.seq \
-	ipsec/HTR_E_In_Padding_rijndaelcbc.seq \
-	ipsec/HTR_E_In_Padding_rijndaelcbc_hmacsha1.seq \
-	ipsec/HTR_E_In_Padding_rijndaelcbc_hmacsha2_256.seq \
-	ipsec/HTR_E_In_ReceiveWindow.seq \
-	ipsec/HTR_E_In_descbc.seq \
-	ipsec/HTR_E_In_SelectUpperProtICMP.seq \
-	ipsec/HTR_E_In_SelectUpperProtTCP.seq \
-	ipsec/HTR_E_In_SelectUpperProtTCPPort.seq \
-	ipsec/HTR_E_In_SelectUpperProtUDP.seq \
-	ipsec/HTR_E_In_SelectUpperProtUDPPort.seq \
-	ipsec/HTR_E_In_SlideReceiveWindow.seq \
-	ipsec/HTR_E_In_descbc_hmacmd5.seq \
-	ipsec/HTR_E_In_descbc_hmacsha1.seq \
-	ipsec/HTR_E_In_descbc_hmacsha2_256.seq \
-	ipsec/HTR_E_In_null_hmacmd5.seq \
-	ipsec/HTR_E_In_null_hmacsha1.seq \
-	ipsec/HTR_E_In_null_hmacsha2_256.seq \
-	ipsec/HTR_E_In_rijndaelcbc.seq \
-	ipsec/HTR_E_In_rijndaelcbc_hmacmd5.seq \
-	ipsec/HTR_E_In_rijndaelcbc_hmacsha1.seq \
-	ipsec/HTR_E_In_rijndaelcbc_hmacsha2_256.seq \
-	ipsec/HTR_E_Out_2SA_DspiDipdst_3descbc.seq \
-	ipsec/HTR_E_Out_2SA_DspiDipdst_descbc.seq \
-	ipsec/HTR_E_Out_2SA_SspiDipdst_3descbc.seq \
-	ipsec/HTR_E_Out_2SA_DspiDipdst_rijndaelcbc.seq \
-	ipsec/HTR_E_Out_2SA_SspiDipdst_descbc.seq \
-	ipsec/HTR_E_Out_2SA_SspiDipdst_rijndaelcbc.seq \
-	ipsec/HTR_E_Out_3descbc.seq \
-	ipsec/HTR_E_Out_3descbc_hmacmd5.seq \
-	ipsec/HTR_E_Out_3descbc_hmacsha1.seq \
-	ipsec/HTR_E_Out_3descbc_hmacsha2_256.seq \
-	ipsec/HTR_E_Out_Fragment_hmacmd5.seq \
-	ipsec/HTR_E_Out_Fragment_hmacsha1.seq \
-	ipsec/HTR_E_Out_Fragment_hmacsha2_256.seq \
-	ipsec/HTR_E_Out_LifetimeSAByte.seq \
-	ipsec/HTR_E_Out_LifetimeSATime.seq \
-	ipsec/HTR_E_Out_Padding_3descbc.seq \
-	ipsec/HTR_E_Out_Padding_3descbc_hmacsha1.seq \
-	ipsec/HTR_E_Out_Padding_3descbc_hmacsha2_256.seq \
-	ipsec/HTR_E_Out_Padding_descbc.seq \
-	ipsec/HTR_E_Out_Padding_descbc_hmacsha1.seq \
-	ipsec/HTR_E_Out_Padding_descbc_hmacsha2_256.seq \
-	ipsec/HTR_E_Out_Padding_null_hmacmd5.seq \
-	ipsec/HTR_E_Out_Padding_null_hmacsha1.seq \
-	ipsec/HTR_E_Out_Padding_null_hmacsha2_256.seq \
-	ipsec/HTR_E_Out_Padding_rijndaelcbc.seq \
-	ipsec/HTR_E_Out_Padding_rijndaelcbc_hmacsha1.seq \
-	ipsec/HTR_E_Out_Padding_rijndaelcbc_hmacsha2_256.seq \
-	ipsec/HTR_E_Out_SelectUpperProtICMP.seq \
-	ipsec/HTR_E_Out_SelectUpperProtTCP.seq \
-	ipsec/HTR_E_Out_SelectUpperProtTCPPort.seq \
-	ipsec/HTR_E_Out_SelectUpperProtUDP.seq \
-	ipsec/HTR_E_Out_SelectUpperProtUDPPort.seq \
-	ipsec/HTR_E_Out_SeqCountOverFlow.seq \
-	ipsec/HTR_E_Out_descbc.seq \
-	ipsec/HTR_E_Out_descbc_hmacmd5.seq \
-	ipsec/HTR_E_Out_descbc_hmacsha1.seq \
-	ipsec/HTR_E_Out_descbc_hmacsha2_256.seq \
-	ipsec/HTR_E_Out_null_hmacmd5.seq \
-	ipsec/HTR_E_Out_null_hmacsha1.seq \
-	ipsec/HTR_E_Out_null_hmacsha2_256.seq \
-	ipsec/HTR_E_Out_rijndaelcbc.seq \
-	ipsec/HTR_E_Out_rijndaelcbc_hmacmd5.seq \
-	ipsec/HTR_E_Out_rijndaelcbc_hmacsha1.seq \
-	ipsec/HTR_E_Out_rijndaelcbc_hmacsha2_256.seq \
-	ipsec/HTR_SetAddress.seq \
-	ipsec/RTU_A_In.seq \
-	ipsec/RTU_A_In_2SA_DspiDipsrc.seq \
-	ipsec/RTU_A_In_2SA_DspiSipsrc.seq \
-	ipsec/RTU_A_In_DM_DSTH_optdata.seq \
-	ipsec/RTU_A_In_DM_DSTH_optlen.seq \
-	ipsec/RTU_A_In_DM_DSTH_opttype.seq \
-	ipsec/RTU_A_In_DM_HBHH_optdata.seq \
-	ipsec/RTU_A_In_DM_HBHH_optlen.seq \
-	ipsec/RTU_A_In_DM_HBHH_opttype.seq \
-	ipsec/RTU_A_In_DM_IPv6H_dst.seq \
-	ipsec/RTU_A_In_DM_IPv6H_hlim.seq \
-	ipsec/RTU_A_In_DM_IPv6H_src.seq \
-	ipsec/RTU_A_In_DM_Inner_IPv6H_hlim.seq \
-	ipsec/RTU_A_In_DM_Inner_Payload.seq \
-	ipsec/RTU_A_In_DM_RH_ipv6h_dst.seq \
-	ipsec/RTU_A_In_DM_RH_lastaddr.seq \
-	ipsec/RTU_A_In_NoSPD.seq \
-	ipsec/RTU_A_In_Order_DSTH.seq \
-	ipsec/RTU_A_In_hmacmd5.seq \
-	ipsec/RTU_A_In_hmacsha1.seq \
-	ipsec/RTU_A_Out_2SA_DspiDipdst.seq \
-	ipsec/RTU_A_Out_2SA_SspiDipdst.seq \
-	ipsec/RTU_A_Out_hmacmd5.seq \
-	ipsec/RTU_A_Out_hmacsha1.seq \
-	ipsec/RTU_C_In_2SA_SspiSipsrcDproto.seq \
-	ipsec/RTU_E_In.seq \
-	ipsec/RTU_E_In_2SA_DspiDipsrc.seq \
-	ipsec/RTU_E_In_2SA_DspiSipsrc.seq \
-	ipsec/RTU_E_In_3descbc.seq \
-	ipsec/RTU_E_In_3descbc_hmacmd5.seq \
-	ipsec/RTU_E_In_3descbc_hmacsha1.seq \
-	ipsec/RTU_E_In_AuthKey.seq \
-	ipsec/RTU_E_In_EncryptKey.seq \
-	ipsec/RTU_E_In_InvalidPadding.seq \
-	ipsec/RTU_E_In_Order_DSTH.seq \
-	ipsec/RTU_E_In_PadLen255.seq \
-	ipsec/RTU_E_In_Padding_3descbc.seq \
-	ipsec/RTU_E_In_Padding_descbc.seq \
-	ipsec/RTU_E_In_Padding_null.seq \
-	ipsec/RTU_E_In_descbc.seq \
-	ipsec/RTU_E_In_descbc_hmacmd5.seq \
-	ipsec/RTU_E_In_descbc_hmacsha1.seq \
-	ipsec/RTU_E_In_null_hmacmd5.seq \
-	ipsec/RTU_E_In_null_hmacsha1.seq \
-	ipsec/RTU_E_Out_2SA_DspiDipdst.seq \
-	ipsec/RTU_E_Out_2SA_SspiDipdst.seq \
-	ipsec/RTU_E_Out_3descbc.seq \
-	ipsec/RTU_E_Out_3descbc_hmacmd5.seq \
-	ipsec/RTU_E_Out_3descbc_hmacsha1.seq \
-	ipsec/RTU_E_Out_Padding_3descbc.seq \
-	ipsec/RTU_E_Out_Padding_descbc.seq \
-	ipsec/RTU_E_Out_Padding_null.seq \
-	ipsec/RTU_E_Out_descbc.seq \
-	ipsec/RTU_E_Out_descbc_hmacmd5.seq \
-	ipsec/RTU_E_Out_descbc_hmacsha1.seq \
-	ipsec/RTU_E_Out_null_hmacmd5.seq \
-	ipsec/RTU_E_Out_null_hmacsha1.seq \
-	ipsec/RTU_SetAddress.seq \
-	ipsec4/HTR_A_In_DM_IPv4H_dst.seq \
-	ipsec4/HTR_A_In_DM_IPv4H_src.seq \
-	ipsec4/HTR_A_In_DM_IPv4H_ttl.seq \
-	ipsec4/HTR_A_In_DM_Payload.seq \
-	ipsec4/RTU_A_In_DM_IPv4H_dst.seq \
-	ipsec4/RTU_A_In_DM_IPv4H_src.seq \
-	ipsec4/RTU_A_In_DM_IPv4H_ttl.seq \
-	ipsec4/RTU_A_In_DM_Inner_IPv4H_ttl.seq \
-	ipsec4/RTU_A_In_DM_Inner_Payload.seq \
-	ipsec4-udp/HTR_A_In_DM_IPv4H_dst.seq \
-	ipsec4-udp/HTR_A_In_DM_IPv4H_src.seq \
-	ipsec4-udp/HTR_A_In_DM_IPv4H_ttl.seq \
-	ipsec4-udp/HTR_A_In_DM_Payload.seq \
-	ipsec4-udp/RTU_A_In_DM_IPv4H_dst.seq \
-	ipsec4-udp/RTU_A_In_DM_IPv4H_src.seq \
-	ipsec4-udp/RTU_A_In_DM_IPv4H_ttl.seq \
-	ipsec4-udp/RTU_A_In_DM_Inner_IPv4H_ttl.seq \
-	ipsec4-udp/RTU_A_In_DM_Inner_Payload.seq \
-	mip6-cn-20/BE_NoBinding.seq \
-	mip6-cn-20/BE_UnknownType.seq \
-	mip6-cn-20/BU_A0_H0.seq \
-	mip6-cn-20/BU_A0_H1.seq \
-	mip6-cn-20/BU_A1_H0.seq \
-	mip6-cn-20/BU_A1_H1.seq \
-	mip6-cn-20/BU_InvalidChecksum_A0.seq \
-	mip6-cn-20/BU_InvalidChecksum_A1.seq \
-	mip6-cn-20/BU_Piggyback_A0.seq \
-	mip6-cn-20/BU_Piggyback_A0_BCE.seq \
-	mip6-cn-20/BU_Piggyback_A1.seq \
-	mip6-cn-20/BU_Piggyback_A1_BCE.seq \
-	mip6-cn-20/BU_SEQ_A0.seq \
-	mip6-cn-20/BU_SEQ_A0_MAX.seq \
-	mip6-cn-20/BU_SEQ_A1.seq \
-	mip6-cn-20/BU_SEQ_A1_MAX.seq \
-	mip6-cn-20/BU_SEQ_EQ_A0.seq \
-	mip6-cn-20/BU_SEQ_EQ_A1.seq \
-	mip6-cn-20/BU_SEQ_LESS_A0.seq \
-	mip6-cn-20/BU_SEQ_LESS_A1.seq \
-	mip6-cn-20/BU_SEQ_MORE_A0.seq \
-	mip6-cn-20/BU_SEQ_MORE_A1.seq \
-	mip6-cn-20/BU_SEQ_OVERFLOW_A0.seq \
-	mip6-cn-20/BU_SEQ_OVERFLOW_A0_MAX.seq \
-	mip6-cn-20/BU_SEQ_OVERFLOW_A1.seq \
-	mip6-cn-20/BU_SEQ_OVERFLOW_A1_MAX.seq \
-	mip6-cn-20/BU_SEQ_OVERFLOW_EQ_A0.seq \
-	mip6-cn-20/BU_SEQ_OVERFLOW_EQ_A1.seq \
-	mip6-cn-20/BU_SEQ_OVERFLOW_LESS_A0.seq \
-	mip6-cn-20/BU_SEQ_OVERFLOW_LESS_A1.seq \
-	mip6-cn-20/BU_SEQ_OVERFLOW_MORE_A0.seq \
-	mip6-cn-20/BU_SEQ_OVERFLOW_MORE_A1.seq \
-	mip6-cn-20/CoTI_BCE.seq \
-	mip6-cn-20/CoTI_HaO.seq \
-	mip6-cn-20/CoTI_InvalidChecksum.seq \
-	mip6-cn-20/CoTI_Piggyback.seq \
-	mip6-cn-20/CoTI_Piggyback_BCE.seq \
-	mip6-cn-20/CoTI_Valid.seq \
-	mip6-cn-20/Delete_LT0_FOREIGN.seq \
-	mip6-cn-20/Delete_LT0_HOME.seq \
-	mip6-cn-20/Delete_LT0_HOME_without_HaO.seq \
-	mip6-cn-20/Delete_LT1_HOME.seq \
-	mip6-cn-20/Delete_LT1_HOME_without_HaO.seq \
-	mip6-cn-20/HoTI_BCE.seq \
-	mip6-cn-20/HoTI_HaO.seq \
-	mip6-cn-20/HoTI_InvalidChecksum.seq \
-	mip6-cn-20/HoTI_Piggyback.seq \
-	mip6-cn-20/HoTI_Piggyback_BCE.seq \
-	mip6-cn-20/HoTI_Valid.seq \
-	mip6-cn-20/Initialization.seq \
-	mip6-cn-20/MIP6.pm \
-	mip6-cn-20/RR_Valid.seq \
-	mip6-ha-20/BE_UnknownType.seq \
-	mip6-ha-20/BU_DAD_Failed_S0_L0.seq \
-	mip6-ha-20/BU_DAD_Failed_S0_L1.seq \
-	mip6-ha-20/BU_DAD_S0_L0.seq \
-	mip6-ha-20/BU_DAD_S0_L1.seq \
-	mip6-ha-20/BU_InvalidChecksum.seq \
-	mip6-ha-20/BU_NA_S0_L0.seq \
-	mip6-ha-20/Initialization.seq \
-	mip6-ha-20/BU_NA_S0_L1.seq \
-	mip6-ha-20/BU_ND_S0_L0.seq \
-	mip6-ha-20/BU_ND_S0_L1.seq \
-	mip6-ha-20/BU_NotHomeSubnet_A0.seq \
-	mip6-ha-20/BU_NotHomeSubnet_A1.seq \
-	mip6-ha-20/BU_Piggyback.seq \
-	mip6-ha-20/BU_Piggyback_BCE.seq \
-	mip6-ha-20/BU_SEQ_A1.seq \
-	mip6-ha-20/BU_SEQ_EQ_A1.seq \
-	mip6-ha-20/BU_SEQ_LESS_A1.seq \
-	mip6-ha-20/BU_SEQ_MAX_A1.seq \
-	mip6-ha-20/BU_SEQ_MORE_A1.seq \
-	mip6-ha-20/BU_SEQ_OVERFLOW_A1.seq \
-	mip6-ha-20/BU_SEQ_OVERFLOW_EQ_A1.seq \
-	mip6-ha-20/BU_SEQ_OVERFLOW_LESS_A1.seq \
-	mip6-ha-20/BU_SEQ_OVERFLOW_MAX_A1.seq \
-	mip6-ha-20/BU_SEQ_OVERFLOW_MORE_A1.seq \
-	mip6-ha-20/BU_Valid_A0.seq \
-	mip6-ha-20/BU_Valid_A1.seq \
-	mip6-ha-20/DHAAD_Delete.seq \
-	mip6-ha-20/DHAAD_HA1_HA2_NUT.seq \
-	mip6-ha-20/DHAAD_HA1_NUT_HA2.seq \
-	mip6-ha-20/DHAAD_HA2_HA1_NUT.seq \
-	mip6-ha-20/DHAAD_HA2_NUT_HA1.seq \
-	mip6-ha-20/DHAAD_Highest.seq \
-	mip6-ha-20/DHAAD_Lowest.seq \
-	mip6-ha-20/DHAAD_NUT_HA1_HA2.seq \
-	mip6-ha-20/DHAAD_NUT_HA2_HA1.seq \
-	mip6-ha-20/DHAAD_Simple.seq \
-	mip6-ha-20/DeReg_LT0_FOREIGN.seq \
-	mip6-ha-20/DeReg_LT0_HOME.seq \
-	mip6-ha-20/DeReg_LT1_HOME.seq \
-	mip6-ha-20/DeReg_NotHA4ThisMN.seq \
-	mip6-ha-20/MIP6.pm \
-	mip6-ha-20/MPS_Simple.seq \
-	mip6-ha-20/PingCNtoMN_LL.seq \
-	mip6-ha-20/PingMNtoHA.seq \
-	mip6-ha-20/RevTun_Simple.seq \
-	mip6-mn-20/MN_BasicBehavior.seq \
-	mip6-mn-20/MN_Init.seq \
-	mip6-mn-20/MoveDAD.seq \
-	mip6-mn-20/MoveFreq.seq \
-	mip6-mn-20/MoveFromForeignToForeign.seq \
-	mip6-mn-20/MoveFromHomeToForeign.seq \
-	mip6-mn-20/MoveRobust.seq \
-	mip6-mn-20/ProcessingBRR.seq \
-	mip6-mn-20/ReceivingBA132.seq \
-	mip6-mn-20/ReceivingPacketWRH.seq \
-	mip6-mn-20/ReceivingPacketWRHold.seq \
-	mip6-mn-20/ReceivingPacketWoRH.seq \
-	mip6-mn-20/ReturningHome.seq \
-	mip6-mn-20/SendingBUtoCN.seq \
-	mip6-mn-20/SendingBUtoHA.seq \
-	mip6-mn-20/SendingDHAAD.seq \
-	mip6-mn-20/SendingDHAADandRegist.seq \
-	mip6-mn-20/SendingMobilePrefixSol.seq \
-	mip6-mn-20/SendingPacketAtForeignLink1.seq \
-	mip6-mn-20/SendingPacketAtForeignLink2.seq \
-	mip6-mn-20/SendingPacketAtHomeLink.seq \
-	natpt/init_natpt_in_out.seq \
-	natpt/init_natpt_out_in.seq \
-	natpt/init_natpt_out_out.seq \
-	natpt/initialize.seq \
-	natpt/initialize_natpt.seq \
-	natpt/ping_siit.seq \
-	natpt/ping_siit_frag.seq \
-	natpt/rfc2765_3.1_frag.seq \
-	natpt/rfc2765_3.1_fragmentation.seq \
-	natpt/rfc2765_3.1_hoplimit.seq \
-	natpt/rfc2765_3.1_nextheader.seq \
-	natpt/rfc2765_3.1_nextheaderfrag.seq \
-	natpt/rfc2765_3.1_options.seq \
-	natpt/rfc2765_3.1_payloadlength.seq \
-	natpt/rfc2765_3.1_sourceroute.seq \
-	natpt/rfc2765_3.1_trafficclass.seq \
-	natpt/rfc2765_3.2_udp.seq \
-	natpt/rfc2765_3.3_icmpv4error.seq \
-	natpt/rfc2765_3.3_icmpv4query.seq \
-	natpt/rfc2765_4.1_frag.seq \
-	natpt/rfc2765_4.1_hoplimit.seq \
-	natpt/rfc2765_4.1_nextheader.seq \
-	natpt/rfc2765_4.1_nextheaderfrag.seq \
-	natpt/rfc2765_4.1_options.seq \
-	natpt/rfc2765_4.1_payloadlength.seq \
-	natpt/rfc2765_4.1_routingheader.seq \
-	natpt/rfc2765_4.1_trafficclass.seq \
-	natpt/rfc2765_4.2_icmpv6error.seq \
-	natpt/rfc2765_4.2_icmpv6query.seq \
-	natpt/rfc2766_4.1_dns_v4tov6.seq \
-	natpt/rfc2766_5.3.1_checksum_icmp.seq \
-	natpt/rfc2766_5.3.1_checksum_tcp_udp.seq \
-	natpt/rfc2766_5.3.2_checksum_icmp.seq \
-	natpt/rfc2766_5.3.2_checksum_tcp_udp.seq \
-	natpt/rfc2766_ping.seq \
-	nd/adrsolvQueuMulti.seq \
-	nd/adrsolvQueuOne.seq \
-	nd/adrsolvQueuTwo.seq \
-	nd/hostRecvRaInvalid.seq \
-	nd/hostRecvRaNHD.seq \
-	nd/hostRecvRaPrefix.seq \
-	nd/hostRecvRaRFlag.seq \
-	nd/hostRecvRaRLifetime0.seq \
-	nd/hostRecvRaRLifetimeN.seq \
-	nd/hostRecvRaReachableTime.seq \
-	nd/hostRecvRaURD.seq \
-	nd/hostRecvRas.seq \
-	nd/hostRecvRas2.seq \
-	nd/hostRecvRedirect4Nonce.seq \
-	nd/hostRecvRedirect4OfflinkDC.seq \
-	nd/hostRecvRedirect4OfflinkNUD.seq \
-	nd/hostRecvRedirect4OnlinkDC.seq \
-	nd/hostRecvRedirect4OnlinkNUD.seq \
-	nd/hostRecvRedirect4RFlag.seq \
-	nd/hostRecvRedirect4RFlag2.seq \
-	nd/hostRecvRedirect4RouterLifetime0.seq \
-	nd/hostRecvRedirect4RouterLifetime02.seq \
-	nd/hostRecvRedirectInvalid.seq \
-	nd/hostRecvRs.seq \
-	nd/reset.seq \
-	nd/hostSendRs.seq \
-	nd/hostSendRsAfterSolicitedRa.seq \
-	nd/hostSendRsAfterUnsolicitedRa.seq \
-	nd/ncStateByNa4Incomplete.seq \
-	nd/ncStateByNa4Nonce.seq \
-	nd/ncStateByNa4Probe.seq \
-	nd/ncStateByNa4Reachable.seq \
-	nd/ncStateByNa4Stale.seq \
-	nd/ncStateByNs4Incomplete.seq \
-	nd/ncStateByNs4NoNce.seq \
-	nd/ncStateByNs4Probe.seq \
-	nd/ncStateByNs4Reachable.seq \
-	nd/ncStateByNs4Stale.seq \
-	nd/ncStateByRa4Incomplete.seq \
-	nd/ncStateByRa4Nonce.seq \
-	nd/ncStateByRa4Probe.seq \
-	nd/ncStateByRa4Reachable.seq \
-	nd/ncStateByRa4Stale.seq \
-	nd/ncStateByRedirect4Incomplete.seq \
-	nd/ncStateByRedirect4Nonce.seq \
-	nd/ncStateByRedirect4Probe.seq \
-	nd/ncStateByRedirect4Reachable.seq \
-	nd/ncStateByRedirect4Stale.seq \
-	nd/ncStateByRs4Incomplete.seq \
-	nd/ncStateByRs4NoNce.seq \
-	nd/ncStateByRs4Probe.seq \
-	nd/ncStateByRs4Reachable.seq \
-	nd/ncStateByRs4Stale.seq \
-	nd/recvNaRFlag.seq \
-	nd/recvNsBasic.seq \
-	nd/recvNsInvalid.seq \
-	nd/recvNsRFlag.seq \
-	nd/routerRecvRa.seq \
-	nd/routerRecvRedirect.seq \
-	nd/routerRecvRs.seq \
-	nd/routerRecvRsInvalid.seq \
-	nd/routerSendRedirectOfflink.seq \
-	nd/routerSendRedirectOfflink2.seq \
-	nd/routerSendRedirectOnlink.seq \
-	nd/routerSendSolRaDefault.seq \
-	nd/routerSendUnsolRaDefault.seq \
-	nd/routerSendUnsolRaDefault2.seq \
-	nd/routerSendUnsolRaMax.seq \
-	nd/routerSendUnsolRaMin.seq \
-	nd/sendMcastNS.seq \
-	nd/sendMcastNS2.seq \
-	nd/sendNsBasicGlobGlob.seq \
-	nd/sendNsBasicGlobLink.seq \
-	nd/sendNsBasicLinkGlob.seq \
-	nd/sendNsBasicLocal.seq \
-	nd/sendUcastNS.seq \
-	nd/sendUcastNS2.seq \
-	nd/startDefaultRA.seq \
-	nd/startRedirect.seq \
-	nd/startRedirect2.seq \
-	nd/stopRA.seq \
-	nd/stopRedirect.seq \
-	nd/stopRedirect2.seq \
-	pd/BEGIN.seq \
-	pd/RRAdvertisedPreference.seq \
-	pd/RRAdvertisedStatusCode.seq \
-	pd/RRDelayedAuthProto.seq \
-	pd/RRRebind.seq \
-	pd/RRRebindIgnored.seq \
-	pd/RRRebindInvalid.seq \
-	pd/RRRebindPhysical.seq \
-	pd/RRRebindStatusCode.seq \
-	pd/RRRecfgKeyAuthProto.seq \
-	pd/RRRelease.seq \
-	pd/RRReleaseRetransmit.seq \
-	pd/RRReleaseRetransmitMRC.seq \
-	pd/RRRenew.seq \
-	pd/RRRenewRebind.seq \
-	pd/RRRepliedServerUnicast.seq \
-	pd/RRRepliedStatusCode.seq \
-	pd/RRRequest.seq \
-	pd/RRSolicit.seq \
-	pd/RRSolicitRapid.seq \
-	pmtu/BEGIN.seq \
-	pmtu/LCNA_RAwMTUopt.seq \
-	pmtu/LCNA_Reassemble.seq \
-	pmtu/LCNA_TBM_gtMinMTU.seq \
-	pmtu/LCNA_TBM_ltMinMTU.seq \
-	pmtu/MultiPMTU.seq \
-	pmtu/PMTU_reset.seq \
-	pmtu/TBM.seq \
-	pmtu/TBM_onlink.seq \
-	pmtu/acceptRAwithMTUOption.seq \
-	pmtu/acceptTooBigMesg.seq \
-	pmtu/checkPMTUincrease.seq \
-	pmtu/confirmPing.seq \
-	pmtu/initPMTU.seq \
-	pmtu/pingwRH.seq \
-	pmtu/setMTU1500.seq \
-	pmtu/setMTUwithRA.seq \
-	robust/FH_Overlap_UDP.seq \
-	robust/FloodPing.seq \
-	robust/FromManyNodes.seq \
-	robust/Init.seq \
-	router-select/DAD_LCNA.pm \
-	router-select/DR_1RT.seq \
-	router-select/DR_2RT_Diff.seq \
-	router-select/DR_2RT_raMED_raHIGHwRTRLIFE0wrtinfoHIGH.seq \
-	router-select/DR_2RT_raMED_raHIGHwRTRLIFE0wrtinfoLIFE0.seq \
-	router-select/Def_HIGH_LOW.seq \
-	router-select/Def_HIGH_LOW_UNREACH.seq \
-	router-select/Def_HIGH_MED.seq \
-	router-select/Def_HIGH_UNSPEC.seq \
-	router-select/Def_LOW_HIGH_RTRLIFE_EXPIRE.seq \
-	router-select/Def_LOW_HIGHwRTRLIFE0.seq \
-	router-select/Def_LOW_UNSPEC.seq \
-	router-select/Def_MED_LOW.seq \
-	router-select/Def_MED_MED.seq \
-	router-select/Def_MED_UNSPEC.seq \
-	router-select/DiffPX_HIGH.seq \
-	router-select/DiffPX_LOW.seq \
-	router-select/DiffPX_MED.seq \
-	router-select/DiffPX_UNSPEC.seq \
-	router-select/ROUTE.pm \
-	router-select/SamePX_HIGH_LOW.seq \
-	router-select/SamePX_HIGH_MED.seq \
-	router-select/SamePX_MED_LOW.seq \
-	router-select/SamePX_UNSPEC_HIGH.seq \
-	router-select/SamePX_UNSPEC_LOW.seq \
-	router-select/SamePX_UNSPEC_MED.seq \
-	router-select/raHIGH_rtinfoHIGH.seq \
-	router-select/raHIGH_rtinfoHIGH_DEFAULT.seq \
-	router-select/raHIGH_rtinfoLOW.seq \
-	router-select/raHIGH_rtinfoLOW_DEFAULT.seq \
-	router-select/raHIGH_rtinfoMED.seq \
-	router-select/raHIGH_rtinfoMED_DEFAULT.seq \
-	router-select/raLOW_rtinfoLIFE0.seq \
-	router-select/raLOW_rtinfoLIFE0_DEFAULT.seq \
-	router-select/raMED_raHIGHrtinfoUNSPEC_DEFAULT.seq \
-	router-select/raMED_raLOWrtinfoUNSPEC_DEFAULT.seq \
-	router-select/raMED_rtinfoHIGH_DEFAULT.seq \
-	router-select/raMED_rtinfoLOW_DEFAULT.seq \
-	router-select/rtinfo_16.seq \
-	router-select/raMED_rtinfoUNSPEC.seq \
-	router-select/rtinfo_2.seq \
-	router-select/rtinfo_64_48.seq \
-	router-select/rtinfo_64_96.seq \
-	router-select/rtinfo_64_HIGH48.seq \
-	router-select/rtinfo_64_LOW96.seq \
-	router-select/rtinfo_LOW_HIGH_RTLIFE_EXPIRE.seq \
-	router-select/rtinfo_LOW_HIGH_UNREACH.seq \
-	router-select/rtinfo_PXLEN48_Len1.seq \
-	router-select/rtinfo_PXLEN96_Len2.seq \
-	router-select/rtinfo_RTRLIFE_gt_RTLIFE.seq \
-	router-select/rtinfo_RTRLIFE_lt_RTLIFE.seq \
-	spec/BEGIN.seq \
-	spec/DH_BadHdrExtLen.seq \
-	spec/DH_BadOptDataLen.seq \
-	spec/DH_Flood.seq \
-	spec/DH_Pad1.seq \
-	spec/DH_PadFlood.seq \
-	spec/DH_PadN.seq \
-	spec/DH_Type00.seq \
-	spec/DH_Type01.seq \
-	spec/DH_Type10.seq \
-	spec/DH_Type10toMC.seq \
-	spec/DH_Type11.seq \
-	spec/DH_Type11toMC.seq \
-	spec/DH_UnrecognizedNxtHdrFlood.seq \
-	spec/DH_UnrecognizedNxtHdrFlood2.seq \
-	spec/EH_HBHOptAfterDstOpt.seq \
-	spec/FH_1stOnly.seq \
-	spec/EH_UnrecognizedNextHeader.seq \
-	spec/FH_2ndOnly.seq \
-	spec/FH_Big65535.seq \
-	spec/FH_Big65536.seq \
-	spec/FH_Flood.seq \
-	spec/FH_InvalidLength.seq \
-	spec/FH_MixA1B1A2B2.seq \
-	spec/FH_MixA1B2A2B1.seq \
-	spec/FH_MixA2B1A1B2.seq \
-	spec/FH_MixA2B2A1B1.seq \
-	spec/FH_Needless.seq \
-	spec/FH_Normal.seq \
-	spec/FH_Overlap.seq \
-	spec/FH_Pre.seq \
-	spec/FH_Reverse.seq \
-	spec/FL_NonZeroOverRouter.seq \
-	spec/FL_NonZeroToHost.seq \
-	spec/HH_BadHdrExtLen.seq \
-	spec/HH_BadHdrExtLenOverRouter.seq \
-	spec/HH_BadOptDataLen.seq \
-	spec/HH_BadOptDataLenOverRouter.seq \
-	spec/HH_Pad1.seq \
-	spec/HH_PadFlood.seq \
-	spec/HH_PadFloodOverRouter.seq \
-	spec/HH_PadN.seq \
-	spec/HH_Type00.seq \
-	spec/HH_Type01.seq \
-	spec/HH_Type10.seq \
-	spec/HH_Type10toMC.seq \
-	spec/HH_Type11.seq \
-	spec/HH_Type11toMC.seq \
-	spec/HL_OneToRouter.seq \
-	spec/HL_ZeroToHost.seq \
-	spec/HL_ZeroToRouter.seq \
-	spec/IH_BadIPv6Len.seq \
-	spec/IH_BadIPv6Ver.seq \
-	spec/IH_NoNextHeader.seq \
-	spec/IH_UnrecognizedNextHeader.seq \
-	spec/IH_UnrecognizedNxtHdrFlood.seq \
-	spec/PL_OddOverRouter.seq \
-	spec/PL_OddToHost.seq \
-	spec/PingOverRouter.seq \
-	spec/PingToHost.seq \
-	spec/RH_AddressLoop.seq \
-	spec/RH_AtHost.seq \
-	spec/RH_BadHdrExtLen.seq \
-	spec/RH_DuplicateAddress.seq \
-	spec/RH_FromSourceNode.seq \
-	spec/RH_HdrExtLenOdd.seq \
-	spec/RH_IntermediateNode.seq \
-	spec/RH_MulticastAddress.seq \
-	spec/RH_RoutingTypeNonZero.seq \
-	spec/RH_SegmentsLeftBig.seq \
-	spec/RH_ToDestinationNode.seq \
-	spec/TC_NonZeroOverRouter.seq \
-	spec/TC_NonZeroToHost.seq \
-	stateless-addrconf/ADDRCONFFail.seq \
-	stateless-addrconf/ADDRCONFManytime.seq \
-	stateless-addrconf/ADDRCONFSuccess.seq \
-	stateless-addrconf/ADDRSTATE_not_reset_VLT.seq \
-	stateless-addrconf/ADDRSTATE_pkt_receiving.seq \
-	stateless-addrconf/ADDRSTATE_reset_VLT.seq \
-	stateless-addrconf/ADDRSTATE_sameprfxes_order.seq \
-	stateless-addrconf/ADDRSTATE_src_select.seq \
-	stateless-addrconf/BEGIN.seq \
-	stateless-addrconf/END.seq \
-	stateless-addrconf/DADFail_DADPostSendNS.seq \
-	stateless-addrconf/DADFail_DADPreSendNS.seq \
-	stateless-addrconf/DADSendNS_DADPostSendNS.seq \
-	stateless-addrconf/DADSuccess_DADPostSendNS.seq \
-	stateless-addrconf/LLA_DADSuccess.seq \
-	stateless-addrconf/LLA_DAD_NAPostDAD_DiffTgt.seq \
-	stateless-addrconf/LLA_DAD_NAPostDAD_HL254.seq \
-	stateless-addrconf/LLA_DAD_NAPostDAD_SF1.seq \
-	stateless-addrconf/LLA_DAD_NAPostDAD_SameTgt.seq \
-	stateless-addrconf/LLA_DAD_NAPostDAD_wSLL.seq \
-	stateless-addrconf/LLA_DAD_NAPostDAD_woTLL.seq \
-	stateless-addrconf/LLA_DAD_NAPreDAD_DiffTgt.seq \
-	stateless-addrconf/LLA_DAD_NAPreDAD_SameTgt.seq \
-	stateless-addrconf/LLA_DAD_NSPostDAD_DiffTgt.seq \
-	stateless-addrconf/LLA_DAD_NSPostDAD_DstAll.seq \
-	stateless-addrconf/LLA_DAD_NSPostDAD_DstTent.seq \
-	stateless-addrconf/LLA_DAD_NSPostDAD_HL254.seq \
-	stateless-addrconf/LLA_DAD_NSPostDAD_SameTgt.seq \
-	stateless-addrconf/LLA_DAD_NSPostDAD_SrcDstUni.seq \
-	stateless-addrconf/LLA_DAD_NSPostDAD_SrcUni.seq \
-	stateless-addrconf/LLA_DAD_NSPostDAD_wSLL.seq \
-	stateless-addrconf/LLA_DAD_NSPreDAD_DiffTgt.seq \
-	stateless-addrconf/LLA_DAD_NSPreDAD_SameTgt.seq \
-	stateless-addrconf/LLA_DAD_NSPreDAD_SrcUni.seq \
-	stateless-addrconf/RA_BOTH_mRAmPXmRT.seq \
-	stateless-addrconf/RA_BOTH_mRAmPXsRT.seq \
-	stateless-addrconf/RA_BOTH_sRAmPXsRT.seq \
-	stateless-addrconf/RA_GA_Success.seq \
-	stateless-addrconf/RA_SLA_Success.seq \
-	stateless-addrconf/RA_decVLT.seq \
-	stateless-addrconf/RA_incVLT.seq \
-	stateless-addrconf/RA_mGA_mRAmPXmRT.seq \
-	stateless-addrconf/RA_mGA_mRAmPXsRT.seq \
-	stateless-addrconf/RA_mGA_sRAmPXsRT.seq \
-	stateless-addrconf/RA_sameVLT.seq \
-	stateless-addrconf/RA_wAF0.seq \
-	stateless-addrconf/RA_wHL254.seq \
-	stateless-addrconf/RA_wPLTgtVLT.seq \
-	stateless-addrconf/RA_wPXLEN130.seq \
-	stateless-addrconf/RA_wPXLEN48.seq \
-	stateless-addrconf/RA_wPXLEN96.seq \
-	stateless-addrconf/RA_wPXLLA.seq \
-	stateless-addrconf/RA_wVLT0.seq \
-	stateless-addrconf/showhead.seq \
-	tunnel/automatic_decapsulation_host.seq \
-	tunnel/automatic_encapsulation_host.seq \
-	tunnel/automatic_encapsulation_router.seq \
-	tunnel/decapsulation_host.seq \
-	tunnel/decapsulation_router.seq \
-	tunnel/encapsulation_host.seq \
-	tunnel/encapsulation_router.seq \
-	tunnel/fragment.seq \
-	tunnel/hoplimit.seq \
-	tunnel/icmpv4.seq \
-	tunnel/ingress_filtering.seq \
-	tunnel/initialize.seq
-
-MAKE_ENV+=	"NUTTYPE=host"
-
-NO_STAGE=	yes
-post-patch:
-	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/net/ct/distinfo b/net/ct/distinfo
deleted file mode 100644
index 8e0b4cb9fe8c..000000000000
--- a/net/ct/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ct-2.1.2.tar.gz) = c611b92492b35c8410f6eafb1a8a2af7c7820492f1600e959f1fa43ffca5b29c
-SIZE (ct-2.1.2.tar.gz) = 1313556
diff --git a/net/ct/files/patch-Makefile b/net/ct/files/patch-Makefile
deleted file mode 100644
index 033ab97cc8a7..000000000000
--- a/net/ct/files/patch-Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.orig	2005-02-16 17:41:53.000000000 +0900
-+++ Makefile	2013-07-21 02:43:37.000000000 +0900
-@@ -4,22 +4,20 @@
- # $TAHI: ct/Makefile,v 1.22.8.1 2005/02/16 08:41:53 akisada Exp $
- #
- 
--INSTALL_DIR=$(PREFIX)/ct
--DOC_DIR=$(PREFIX)/doc
-+INSTALL_DIR=$(PREFIX)/v6eval/ct
-+DOC_DIR=$(PREFIX)/v6eval/doc
- DOCFILES= 00README.ct CHANGELOG.ct INSTALL.ct
--CRFILES= COPYRIGHT
- 
- all:
- 
- afterinstall:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -d -o root -g wheel -m 755 $(DOC_DIR)
--	install -c -o bin -g bin -m 444 $(CRFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(DOCFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(DOCFILES) $(DOC_DIR)
--	install -c -o bin -g bin -m 444 index.html $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.inc $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 755 $(INSTALL_DIR)
-+	install -d -m 755 $(DOC_DIR)
-+	${BSD_INSTALL_DATA} $(DOCFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(DOCFILES) $(DOC_DIR)
-+	${BSD_INSTALL_DATA} index.html $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.inc $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "Makefile.test"
- .include "Makefile.inc"
diff --git a/net/ct/files/patch-Makefile.inc b/net/ct/files/patch-Makefile.inc
deleted file mode 100644
index dc10a2ae26e0..000000000000
--- a/net/ct/files/patch-Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
---- Makefile.inc.orig	2013-06-17 01:17:58.000000000 +0900
-+++ Makefile.inc	2013-06-17 01:18:14.000000000 +0900
-@@ -1,4 +1,4 @@
--PREFIX=/usr/local/v6eval
-+PREFIX?=	%%PREFIX%%/v6eval
- 
- .ifndef AUTORUN
- AUTORUN = $(PREFIX)/bin/autorun
diff --git a/net/ct/files/patch-dd-Makefile b/net/ct/files/patch-dd-Makefile
deleted file mode 100644
index a8da87ba3106..000000000000
--- a/net/ct/files/patch-dd-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- dd/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ dd/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -1,4 +1,4 @@
--INSTALL_DIR=$(PREFIX)/ct/dd
-+INSTALL_DIR=$(PREFIX)/v6eval/ct/dd
- 
- SFILES= *.seq *.pm *.pl *.sh
- DFILES= *.def *.tmpl
-@@ -11,10 +11,10 @@
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(SFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(DFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(ETCFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(SFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(DFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(ETCFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "./Makefile.test"
diff --git a/net/ct/files/patch-default-addr-select-Makefile b/net/ct/files/patch-default-addr-select-Makefile
deleted file mode 100644
index 79da5fdb2f1f..000000000000
--- a/net/ct/files/patch-default-addr-select-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- default-addr-select/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ default-addr-select/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -3,16 +3,16 @@
- #
- # $TAHI: ct/default-addr-select/Makefile,v 1.1 2002/09/25 12:07:24 kenta Exp $
- #
--INSTALL_DIR=$(PREFIX)/ct/default-addr-select
-+INSTALL_DIR=$(PREFIX)/v6eval/ct/default-addr-select
- XFILES = *.seq *.pm 
- FILES = *.def INDEX* *.html 00README .footer
- 
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(XFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(FILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(XFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(FILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "Makefile.test"
diff --git a/net/ct/files/patch-icmp-Makefile b/net/ct/files/patch-icmp-Makefile
deleted file mode 100644
index f5dd628d0050..000000000000
--- a/net/ct/files/patch-icmp-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- icmp/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ icmp/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -1,13 +1,13 @@
--INSTALL_DIR=$(PREFIX)/ct/icmp
-+INSTALL_DIR=$(PREFIX)/v6eval/ct/icmp
- XFILES = *.seq *.pm
- FILES = *.def INDEX* *.html 00README .footer
- 
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(XFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(FILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(XFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(FILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "Makefile.test"
diff --git a/net/ct/files/patch-ipsec-Makefile b/net/ct/files/patch-ipsec-Makefile
deleted file mode 100644
index db5b2f9b3f9c..000000000000
--- a/net/ct/files/patch-ipsec-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- ipsec/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ ipsec/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -3,16 +3,16 @@
- #
- # $TAHI: ct/ipsec/Makefile,v 1.9 2003/06/10 12:11:16 ozoe Exp $
- #
--INSTALL_DIR=$(PREFIX)/ct/ipsec
-+INSTALL_DIR=$(PREFIX)/v6eval/ct/ipsec
- XFILES = *.seq *.pm
- FILES = *.def INDEX* *.html 00README .footer *.tmpl
- 
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(XFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(FILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(XFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(FILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "Makefile.test"
diff --git a/net/ct/files/patch-ipsec-udp-Makefile b/net/ct/files/patch-ipsec-udp-Makefile
deleted file mode 100644
index 59d8ff2daa19..000000000000
--- a/net/ct/files/patch-ipsec-udp-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- ipsec-udp/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ ipsec-udp/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -3,14 +3,14 @@
- #
- # $TAHI: ct/ipsec-udp/Makefile,v 1.2 2003/06/10 10:48:48 akisada Exp $
- #
--INSTALL_DIR=$(PREFIX)/ct/ipsec-udp
-+INSTALL_DIR=$(PREFIX)/v6eval/ct/ipsec-udp
- FILES = *.def INDEX* *.html 00README .footer *.tmpl
- 
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(FILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(FILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "Makefile.test"
diff --git a/net/ct/files/patch-ipsec4-Makefile b/net/ct/files/patch-ipsec4-Makefile
deleted file mode 100644
index 4f0846c2600f..000000000000
--- a/net/ct/files/patch-ipsec4-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- ipsec4/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ ipsec4/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -3,16 +3,16 @@
- #
- # $TAHI: ct/ipsec4/Makefile,v 1.8 2001/10/05 06:38:59 masaxmasa Exp $
- #
--INSTALL_DIR=$(PREFIX)/ct/ipsec4
-+INSTALL_DIR=$(PREFIX)/v6eval/ct/ipsec4
- XFILES = *.seq
- FILES = *.def INDEX* *.html 00README .footer
- 
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(XFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(FILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(XFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(FILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "Makefile.test"
diff --git a/net/ct/files/patch-ipsec4-udp-Makefile b/net/ct/files/patch-ipsec4-udp-Makefile
deleted file mode 100644
index 8290459cf63c..000000000000
--- a/net/ct/files/patch-ipsec4-udp-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- ipsec4-udp/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ ipsec4-udp/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -3,16 +3,16 @@
- #
- # $TAHI: ct/ipsec4-udp/Makefile,v 1.5 2001/10/05 06:39:01 masaxmasa Exp $
- #
--INSTALL_DIR=$(PREFIX)/ct/ipsec4-udp
-+INSTALL_DIR=$(PREFIX)/v6eval/ct/ipsec4-udp
- XFILES = *.seq
- FILES = *.def INDEX* *.html 00README .footer
- 
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(XFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(FILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(XFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(FILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "Makefile.test"
diff --git a/net/ct/files/patch-mip6-cn-20-Makefile b/net/ct/files/patch-mip6-cn-20-Makefile
deleted file mode 100644
index 0bc37572e1db..000000000000
--- a/net/ct/files/patch-mip6-cn-20-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- mip6-cn-20/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ mip6-cn-20/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -43,16 +43,16 @@
- #
- ################################################################
- 
--INSTALL_DIR = $(PREFIX)/ct/mip6-cn-20
-+INSTALL_DIR = $(PREFIX)/v6eval/ct/mip6-cn-20
- XFILES      = *.seq *.pm
- FILES       = *.def *.html INDEX .footer
- 
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(XFILES)     $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(FILES)      $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(XFILES)     $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(FILES)      $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "Makefile.test"
diff --git a/net/ct/files/patch-mip6-ha-20-Makefile b/net/ct/files/patch-mip6-ha-20-Makefile
deleted file mode 100644
index 86daf10bd7af..000000000000
--- a/net/ct/files/patch-mip6-ha-20-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- mip6-ha-20/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ mip6-ha-20/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -42,16 +42,16 @@
- # $TAHI: ct/mip6-ha-20/Makefile,v 1.3 2003/06/04 07:19:14 akisada Exp $
- #
- 
--INSTALL_DIR = $(PREFIX)/ct/mip6-ha-20
-+INSTALL_DIR = $(PREFIX)/v6eval/ct/mip6-ha-20
- XFILES      = *.seq *.pm
- FILES       = *.def *.html INDEX .footer *.tmpl
- 
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(XFILES)     $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(FILES)      $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(XFILES)     $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(FILES)      $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "Makefile.test"
diff --git a/net/ct/files/patch-mip6-mn-20-Makefile b/net/ct/files/patch-mip6-mn-20-Makefile
deleted file mode 100644
index 62dcdf1ae3ae..000000000000
--- a/net/ct/files/patch-mip6-mn-20-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- mip6-mn-20/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ mip6-mn-20/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -42,16 +42,16 @@
- # $Author?$
- #
- 
--INSTALL_DIR = $(PREFIX)/ct/mip6-mn-20
-+INSTALL_DIR = $(PREFIX)/v6eval/ct/mip6-mn-20
- XFILES      = *.seq
- FILES       = *.def *.html INDEX_mn .footer *.pm
- 
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(XFILES)     $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(FILES)      $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(XFILES)     $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(FILES)      $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "Makefile.test"
diff --git a/net/ct/files/patch-natpt-Makefile b/net/ct/files/patch-natpt-Makefile
deleted file mode 100644
index 7e556e32a8dc..000000000000
--- a/net/ct/files/patch-natpt-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- natpt/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ natpt/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -42,16 +42,16 @@
- # $TAHI: ct/natpt/Makefile,v 1.5 2001/10/19 08:28:45 akisada Exp $
- #
- 
--INSTALL_DIR = $(PREFIX)/ct/natpt
-+INSTALL_DIR = $(PREFIX)/v6eval/ct/natpt
- XFILES      = *.seq
- FILES       = *.def *.html INDEX_router .footer natpt.pm 00README TODO
- 
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(XFILES)     $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(FILES)      $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(XFILES)     $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(FILES)      $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "Makefile.test"
diff --git a/net/ct/files/patch-nd-Makefile b/net/ct/files/patch-nd-Makefile
deleted file mode 100644
index 36bcaf3fb3a3..000000000000
--- a/net/ct/files/patch-nd-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- nd/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ nd/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -1,4 +1,4 @@
--INSTALL_DIR=$(PREFIX)/ct/nd
-+INSTALL_DIR=$(PREFIX)/v6eval/ct/nd
- 
- SFILES= *.seq *.pm
- DFILES= *.def
-@@ -13,10 +13,10 @@
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(SFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(DFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(ETCFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(SFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(DFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(ETCFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "./Makefile.test"
diff --git a/net/ct/files/patch-pd-Makefile b/net/ct/files/patch-pd-Makefile
deleted file mode 100644
index 7e34030b9a6d..000000000000
--- a/net/ct/files/patch-pd-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- pd/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ pd/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -1,4 +1,4 @@
--INSTALL_DIR=$(PREFIX)/ct/pd
-+INSTALL_DIR=$(PREFIX)/v6eval/ct/pd
- 
- SFILES= *.seq *.pm
- DFILES= *.def *.tmpl
-@@ -12,10 +12,10 @@
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(SFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(DFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(ETCFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(SFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(DFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(ETCFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "./Makefile.test"
diff --git a/net/ct/files/patch-pmtu-Makefile b/net/ct/files/patch-pmtu-Makefile
deleted file mode 100644
index 35ca0385a878..000000000000
--- a/net/ct/files/patch-pmtu-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- pmtu/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ pmtu/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -1,13 +1,13 @@
--INSTALL_DIR=$(PREFIX)/ct/pmtu
-+INSTALL_DIR=$(PREFIX)/v6eval/ct/pmtu
- XFILES = *.seq *.pm 
- FILES = *.def INDEX* *.html 00README .footer
- 
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(XFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(FILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(XFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(FILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "Makefile.test"
diff --git a/net/ct/files/patch-robust-Makefile b/net/ct/files/patch-robust-Makefile
deleted file mode 100644
index 092a2241b293..000000000000
--- a/net/ct/files/patch-robust-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- robust/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ robust/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -3,16 +3,16 @@
- #
- # $TAHI: ct/robust/Makefile,v 1.5 2001/10/05 06:39:14 masaxmasa Exp $
- #
--INSTALL_DIR=$(PREFIX)/ct/robust
-+INSTALL_DIR=$(PREFIX)/v6eval/ct/robust
- XFILES = *.seq 
- FILES = *.def INDEX* *.html .footer
- 
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(XFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(FILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(XFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(FILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "Makefile.test"
diff --git a/net/ct/files/patch-router-select-Makefile b/net/ct/files/patch-router-select-Makefile
deleted file mode 100644
index 81380fadd5f6..000000000000
--- a/net/ct/files/patch-router-select-Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- router-select/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ router-select/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -1,4 +1,4 @@
--INSTALL_DIR=$(PREFIX)/ct/router-select
-+INSTALL_DIR=$(PREFIX)/v6eval/ct/router-select
- XFILES = *.seq *.pm
- FILES = *.def INDEX* .footer *.html
- 
-@@ -7,9 +7,9 @@
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(XFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(FILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(XFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(FILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "../Makefile.inc"
diff --git a/net/ct/files/patch-spec-Makefile b/net/ct/files/patch-spec-Makefile
deleted file mode 100644
index f8d467c85b08..000000000000
--- a/net/ct/files/patch-spec-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- spec/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ spec/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -3,16 +3,16 @@
- #
- # $TAHI: ct/spec/Makefile,v 1.6 2001/10/05 06:39:17 masaxmasa Exp $
- #
--INSTALL_DIR=$(PREFIX)/ct/spec
-+INSTALL_DIR=$(PREFIX)/v6eval/ct/spec
- XFILES = *.seq *.pm 
- FILES = *.def INDEX* *.html 00README .footer
- 
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(XFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(FILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(XFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(FILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "Makefile.test"
diff --git a/net/ct/files/patch-stateless-addrconf-Makefile b/net/ct/files/patch-stateless-addrconf-Makefile
deleted file mode 100644
index ab0f53e20773..000000000000
--- a/net/ct/files/patch-stateless-addrconf-Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- stateless-addrconf/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ stateless-addrconf/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -1,4 +1,4 @@
--INSTALL_DIR=$(PREFIX)/ct/stateless-addrconf
-+INSTALL_DIR=$(PREFIX)/v6eval/ct/stateless-addrconf
- XFILES = *.seq *.pm
- FILES = *.def *.pktdesc INDEX* *.html 00README .footer
- 
-@@ -7,9 +7,9 @@
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(XFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(FILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(XFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(FILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "../Makefile.inc"
diff --git a/net/ct/files/patch-tunnel-Makefile b/net/ct/files/patch-tunnel-Makefile
deleted file mode 100644
index e907b7e7e836..000000000000
--- a/net/ct/files/patch-tunnel-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- tunnel/Makefile.orig	2013-06-17 01:19:37.000000000 +0900
-+++ tunnel/Makefile	2013-06-17 01:23:46.000000000 +0900
-@@ -1,13 +1,13 @@
--INSTALL_DIR=$(PREFIX)/ct/tunnel
-+INSTALL_DIR=$(PREFIX)/v6eval/ct/tunnel
- XFILES = *.seq *.pm 
- FILES = *.def INDEX* *.html 00README .footer
- 
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INSTALL_DIR)
--	install -c -o bin -g bin -m 555 $(XFILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 $(FILES) $(INSTALL_DIR)
--	install -c -o bin -g bin -m 444 Makefile.test $(INSTALL_DIR)/Makefile
-+	install -d -m 555 $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(XFILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} $(FILES) $(INSTALL_DIR)
-+	${BSD_INSTALL_DATA} Makefile.test $(INSTALL_DIR)/Makefile
- 
- .include "Makefile.test"
diff --git a/net/ct/pkg-descr b/net/ct/pkg-descr
deleted file mode 100644
index 7ea368b17dd5..000000000000
--- a/net/ct/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-ct is IPv6 Conformance Test Kit.
-
-WWW: http://www.tahi.org/
diff --git a/net/ct/pkg-plist b/net/ct/pkg-plist
deleted file mode 100644
index 59c07febd1c0..000000000000
--- a/net/ct/pkg-plist
+++ /dev/null
@@ -1,2375 +0,0 @@
-v6eval/ct/00README.ct
-v6eval/ct/CHANGELOG.ct
-v6eval/ct/INSTALL.ct
-v6eval/ct/Makefile
-v6eval/ct/Makefile.inc
-v6eval/ct/dd/.footer
-v6eval/ct/dd/00README
-v6eval/ct/dd/BEGIN.html
-v6eval/ct/dd/BEGIN.seq
-v6eval/ct/dd/DDDHCPv6.def
-v6eval/ct/dd/DDDHCPv6.html
-v6eval/ct/dd/DDDHCPv6.seq
-v6eval/ct/dd/DDWellKnown.def
-v6eval/ct/dd/DDWellKnown.html
-v6eval/ct/dd/DDWellKnown.seq
-v6eval/ct/dd/INDEX_begin
-v6eval/ct/dd/INDEX_dd
-v6eval/ct/dd/Makefile
-v6eval/ct/dd/dd.html
-v6eval/ct/dd/dd.pm
-v6eval/ct/dd/dd_addr.def
-v6eval/ct/dd/dd_common.def
-v6eval/ct/dd/dhcp6.sh
-v6eval/ct/dd/index.html
-v6eval/ct/dd/kame-freebsd.dhcp6c.tmpl
-v6eval/ct/dd/nameserver.pl
-v6eval/ct/dd/type.def
-v6eval/ct/default-addr-select/.footer
-v6eval/ct/default-addr-select/00README
-v6eval/ct/default-addr-select/ADDR_SELECT.def
-v6eval/ct/default-addr-select/ADDR_SELECT.html
-v6eval/ct/default-addr-select/ADDR_SELECT.pm
-v6eval/ct/default-addr-select/BEGIN.html
-v6eval/ct/default-addr-select/BEGIN.seq
-v6eval/ct/default-addr-select/DstSelectExample4.html
-v6eval/ct/default-addr-select/DstSelectExample4.seq
-v6eval/ct/default-addr-select/DstSelectExample6.html
-v6eval/ct/default-addr-select/DstSelectExample6.seq
-v6eval/ct/default-addr-select/DstSelectExample7.html
-v6eval/ct/default-addr-select/DstSelectExample7.seq
-v6eval/ct/default-addr-select/DstSelectExample8.html
-v6eval/ct/default-addr-select/DstSelectExample8.seq
-v6eval/ct/default-addr-select/DstSelectExample9.html
-v6eval/ct/default-addr-select/DstSelectExample9.seq
-v6eval/ct/default-addr-select/DstSelectRule10.html
-v6eval/ct/default-addr-select/DstSelectRule10.seq
-v6eval/ct/default-addr-select/DstSelectRule2.html
-v6eval/ct/default-addr-select/DstSelectRule2.seq
-v6eval/ct/default-addr-select/DstSelectRule2_deprecated.html
-v6eval/ct/default-addr-select/DstSelectRule2_deprecated.seq
-v6eval/ct/default-addr-select/DstSelectRule3.html
-v6eval/ct/default-addr-select/DstSelectRule3.seq
-v6eval/ct/default-addr-select/DstSelectRule5.html
-v6eval/ct/default-addr-select/DstSelectRule5.seq
-v6eval/ct/default-addr-select/DstSelectRule6.html
-v6eval/ct/default-addr-select/DstSelectRule6.seq
-v6eval/ct/default-addr-select/DstSelectRule7.html
-v6eval/ct/default-addr-select/DstSelectRule7.seq
-v6eval/ct/default-addr-select/DstSelectRule8.html
-v6eval/ct/default-addr-select/DstSelectRule8.seq
-v6eval/ct/default-addr-select/DstSelectRule9.html
-v6eval/ct/default-addr-select/DstSelectRule9.seq
-v6eval/ct/default-addr-select/END.html
-v6eval/ct/default-addr-select/END.seq
-v6eval/ct/default-addr-select/INDEX
-v6eval/ct/default-addr-select/Makefile
-v6eval/ct/default-addr-select/SrcSelectExample1.html
-v6eval/ct/default-addr-select/SrcSelectExample1.seq
-v6eval/ct/default-addr-select/SrcSelectExample10.html
-v6eval/ct/default-addr-select/SrcSelectExample10.seq
-v6eval/ct/default-addr-select/SrcSelectExample5.html
-v6eval/ct/default-addr-select/SrcSelectExample5.seq
-v6eval/ct/default-addr-select/SrcSelectExample6.html
-v6eval/ct/default-addr-select/SrcSelectExample6.seq
-v6eval/ct/default-addr-select/SrcSelectExample7.html
-v6eval/ct/default-addr-select/SrcSelectExample7.seq
-v6eval/ct/default-addr-select/SrcSelectExample9.html
-v6eval/ct/default-addr-select/SrcSelectExample9.seq
-v6eval/ct/default-addr-select/SrcSelectRule1.html
-v6eval/ct/default-addr-select/SrcSelectRule1.seq
-v6eval/ct/default-addr-select/SrcSelectRule1_deprecated.html
-v6eval/ct/default-addr-select/SrcSelectRule1_deprecated.seq
-v6eval/ct/default-addr-select/SrcSelectRule2.html
-v6eval/ct/default-addr-select/SrcSelectRule2.seq
-v6eval/ct/default-addr-select/SrcSelectRule2_TempAddr.html
-v6eval/ct/default-addr-select/SrcSelectRule2_TempAddr.seq
-v6eval/ct/default-addr-select/SrcSelectRule2_deprecated.html
-v6eval/ct/default-addr-select/SrcSelectRule2_deprecated.seq
-v6eval/ct/default-addr-select/SrcSelectRule3.html
-v6eval/ct/default-addr-select/SrcSelectRule3.seq
-v6eval/ct/default-addr-select/SrcSelectRule3_TempAddr.html
-v6eval/ct/default-addr-select/SrcSelectRule3_TempAddr.seq
-v6eval/ct/default-addr-select/SrcSelectRule5.html
-v6eval/ct/default-addr-select/SrcSelectRule5.seq
-v6eval/ct/default-addr-select/SrcSelectRule5_TempAddr.html
-v6eval/ct/default-addr-select/SrcSelectRule5_TempAddr.seq
-v6eval/ct/default-addr-select/SrcSelectRule5_deprecated.html
-v6eval/ct/default-addr-select/SrcSelectRule5_deprecated.seq
-v6eval/ct/default-addr-select/SrcSelectRule6.html
-v6eval/ct/default-addr-select/SrcSelectRule6.seq
-v6eval/ct/default-addr-select/SrcSelectRule7.html
-v6eval/ct/default-addr-select/SrcSelectRule7.seq
-v6eval/ct/default-addr-select/SrcSelectRule8.html
-v6eval/ct/default-addr-select/SrcSelectRule8.seq
-v6eval/ct/default-addr-select/das_rules.html
-v6eval/ct/default-addr-select/index.html
-v6eval/ct/icmp/.footer
-v6eval/ct/icmp/00README
-v6eval/ct/icmp/BEGIN.html
-v6eval/ct/icmp/BEGIN.seq
-v6eval/ct/icmp/Dst_Unreach_0_Global.def
-v6eval/ct/icmp/Dst_Unreach_0_Global.html
-v6eval/ct/icmp/Dst_Unreach_0_Global.seq
-v6eval/ct/icmp/Dst_Unreach_3_Global.def
-v6eval/ct/icmp/Dst_Unreach_3_Global.html
-v6eval/ct/icmp/Dst_Unreach_3_Global.seq
-v6eval/ct/icmp/Dst_Unreach_4_Global.def
-v6eval/ct/icmp/Dst_Unreach_4_Global.html
-v6eval/ct/icmp/Dst_Unreach_4_Global.seq
-v6eval/ct/icmp/Dst_Unreach_4_Link-Local.def
-v6eval/ct/icmp/Dst_Unreach_4_Link-Local.html
-v6eval/ct/icmp/Dst_Unreach_4_Link-Local.seq
-v6eval/ct/icmp/Echo_Checksum.def
-v6eval/ct/icmp/Echo_Checksum.html
-v6eval/ct/icmp/Echo_Checksum.seq
-v6eval/ct/icmp/Echo_Global.def
-v6eval/ct/icmp/Echo_Global.html
-v6eval/ct/icmp/Echo_Global.seq
-v6eval/ct/icmp/Echo_Link-Local.def
-v6eval/ct/icmp/Echo_Link-Local.html
-v6eval/ct/icmp/Echo_Link-Local.seq
-v6eval/ct/icmp/Echo_Multicast.def
-v6eval/ct/icmp/Echo_Multicast.html
-v6eval/ct/icmp/Echo_Multicast.seq
-v6eval/ct/icmp/Err_Msg_Size_Dst_Unreach_4.def
-v6eval/ct/icmp/Err_Msg_Size_Dst_Unreach_4.html
-v6eval/ct/icmp/Err_Msg_Size_Dst_Unreach_4.seq
-v6eval/ct/icmp/Err_Msg_Size_P_Problem.def
-v6eval/ct/icmp/Err_Msg_Size_P_Problem.html
-v6eval/ct/icmp/Err_Msg_Size_P_Problem.seq
-v6eval/ct/icmp/Err_Msg_Size_Time_Exc.def
-v6eval/ct/icmp/Err_Msg_Size_Time_Exc.html
-v6eval/ct/icmp/Err_Msg_Size_Time_Exc.seq
-v6eval/ct/icmp/FH_Pre.html
-v6eval/ct/icmp/FH_Pre.seq
-v6eval/ct/icmp/Fragment.def
-v6eval/ct/icmp/INDEX_BEGIN
-v6eval/ct/icmp/INDEX_BEGIN_ume
-v6eval/ct/icmp/INDEX_host_router
-v6eval/ct/icmp/INDEX_ume
-v6eval/ct/icmp/INDEX_ume_router
-v6eval/ct/icmp/Makefile
-v6eval/ct/icmp/P_Problem_Global.def
-v6eval/ct/icmp/P_Problem_Global.html
-v6eval/ct/icmp/P_Problem_Global.seq
-v6eval/ct/icmp/P_Problem_Link-Local.def
-v6eval/ct/icmp/P_Problem_Link-Local.html
-v6eval/ct/icmp/P_Problem_Link-Local.seq
-v6eval/ct/icmp/Pkt_Too_Big.def
-v6eval/ct/icmp/Pkt_Too_Big.html
-v6eval/ct/icmp/Pkt_Too_Big.pm
-v6eval/ct/icmp/Pkt_Too_Big.seq
-v6eval/ct/icmp/Time_Exc_Global.def
-v6eval/ct/icmp/Time_Exc_Global.html
-v6eval/ct/icmp/Time_Exc_Global.seq
-v6eval/ct/icmp/Time_Exc_Link-Local.def
-v6eval/ct/icmp/Time_Exc_Link-Local.html
-v6eval/ct/icmp/Time_Exc_Link-Local.seq
-v6eval/ct/icmp/To_ICMPErr_Dst_Unreach_3.def
-v6eval/ct/icmp/To_ICMPErr_Dst_Unreach_3.html
-v6eval/ct/icmp/To_ICMPErr_Dst_Unreach_3.seq
-v6eval/ct/icmp/To_ICMPErr_Dst_Unreach_4.def
-v6eval/ct/icmp/To_ICMPErr_Dst_Unreach_4.html
-v6eval/ct/icmp/To_ICMPErr_Dst_Unreach_4.seq
-v6eval/ct/icmp/To_ICMPErr_Time_Exc.def
-v6eval/ct/icmp/To_ICMPErr_Time_Exc.seq
-v6eval/ct/icmp/To_Multi_Dst_Unreach_4.def
-v6eval/ct/icmp/To_Multi_Dst_Unreach_4.html
-v6eval/ct/icmp/To_Multi_Dst_Unreach_4.seq
-v6eval/ct/icmp/To_Multi_Time_Exc.def
-v6eval/ct/icmp/To_Multi_Time_Exc.html
-v6eval/ct/icmp/To_Multi_Time_Exc.seq
-v6eval/ct/icmp/Unknown_Infomsg.def
-v6eval/ct/icmp/Unknown_Infomsg.html
-v6eval/ct/icmp/Unknown_Infomsg.seq
-v6eval/ct/icmp/destination_unreachable_code_two.def
-v6eval/ct/icmp/destination_unreachable_code_two.seq
-v6eval/ct/icmp/icmp.def
-v6eval/ct/icmp/icmp.pm
-v6eval/ct/icmp/index.html
-v6eval/ct/index.html
-v6eval/ct/ipsec-udp/.footer
-v6eval/ct/ipsec-udp/00README
-v6eval/ct/ipsec-udp/HTR_E_2SA_DspiDip_3descbc.def
-v6eval/ct/ipsec-udp/HTR_E_2SA_DspiDip_descbc.def
-v6eval/ct/ipsec-udp/HTR_E_2SA_DspiDip_rijndaelcbc.def
-v6eval/ct/ipsec-udp/HTR_E_2SA_DspiSip_3descbc.def
-v6eval/ct/ipsec-udp/HTR_E_2SA_DspiSip_descbc.def
-v6eval/ct/ipsec-udp/HTR_E_2SA_DspiSip_rijndaelcbc.def
-v6eval/ct/ipsec-udp/HTR_E_2SA_SspiDip_3descbc.def
-v6eval/ct/ipsec-udp/HTR_E_2SA_SspiDip_descbc.def
-v6eval/ct/ipsec-udp/HTR_E_2SA_SspiDip_rijndaelcbc.def
-v6eval/ct/ipsec-udp/HTR_E_3descbc.def
-v6eval/ct/ipsec-udp/HTR_E_3descbc_hmacmd5.def
-v6eval/ct/ipsec-udp/HTR_E_3descbc_hmacsha1.def
-v6eval/ct/ipsec-udp/HTR_E_3descbc_hmacsha2_256.def
-v6eval/ct/ipsec-udp/HTR_E_AuthKey_hmacmd5.def
-v6eval/ct/ipsec-udp/HTR_E_AuthKey_hmacsha1.def
-v6eval/ct/ipsec-udp/HTR_E_AuthKey_hmacsha2_256.def
-v6eval/ct/ipsec-udp/HTR_E_DuplicateSequence.def
-v6eval/ct/ipsec-udp/HTR_E_EncryptKey_3descbc.def
-v6eval/ct/ipsec-udp/HTR_E_EncryptKey_descbc.def
-v6eval/ct/ipsec-udp/HTR_E_EncryptKey_rijndaelcbc.def
-v6eval/ct/ipsec-udp/HTR_E_Fragment_hmacmd5.def
-v6eval/ct/ipsec-udp/HTR_E_Fragment_hmacsha1.def
-v6eval/ct/ipsec-udp/HTR_E_Fragment_hmacsha2_256.def
-v6eval/ct/ipsec-udp/HTR_E_InvalidPadding_3descbc.def
-v6eval/ct/ipsec-udp/HTR_E_InvalidPadding_descbc.def
-v6eval/ct/ipsec-udp/HTR_E_InvalidPadding_rijndaelcbc.def
-v6eval/ct/ipsec-udp/HTR_E_LifetimeSA.def
-v6eval/ct/ipsec-udp/HTR_E_PadLen255_3descbc.def
-v6eval/ct/ipsec-udp/HTR_E_PadLen255_descbc.def
-v6eval/ct/ipsec-udp/HTR_E_PadLen255_rijndaelcbc.def
-v6eval/ct/ipsec-udp/HTR_E_Padding_3descbc.def
-v6eval/ct/ipsec-udp/HTR_E_Padding_3descbc_hmacsha1.def
-v6eval/ct/ipsec-udp/HTR_E_Padding_3descbc_hmacsha2_256.def
-v6eval/ct/ipsec-udp/HTR_E_Padding_descbc.def
-v6eval/ct/ipsec-udp/HTR_E_Padding_descbc_hmacsha1.def
-v6eval/ct/ipsec-udp/HTR_E_Padding_descbc_hmacsha2_256.def
-v6eval/ct/ipsec-udp/HTR_E_Padding_null_hmacmd5.def
-v6eval/ct/ipsec-udp/HTR_E_Padding_null_hmacsha1.def
-v6eval/ct/ipsec-udp/HTR_E_Padding_null_hmacsha2_256.def
-v6eval/ct/ipsec-udp/HTR_E_Padding_rijndaelcbc.def
-v6eval/ct/ipsec-udp/HTR_E_Padding_rijndaelcbc_hmacsha1.def
-v6eval/ct/ipsec-udp/HTR_E_Padding_rijndaelcbc_hmacsha2_256.def
-v6eval/ct/ipsec-udp/HTR_E_ReceiveWindow.def
-v6eval/ct/ipsec-udp/HTR_E_SPD_discard_none.def
-v6eval/ct/ipsec-udp/HTR_E_SeqCountOverFlow.def
-v6eval/ct/ipsec-udp/HTR_E_SlideReceiveWindow.def
-v6eval/ct/ipsec-udp/HTR_E_common.def
-v6eval/ct/ipsec-udp/HTR_E_descbc.def
-v6eval/ct/ipsec-udp/HTR_E_descbc_hmacmd5.def
-v6eval/ct/ipsec-udp/HTR_E_descbc_hmacsha1.def
-v6eval/ct/ipsec-udp/HTR_E_descbc_hmacsha2_256.def
-v6eval/ct/ipsec-udp/HTR_E_null.def
-v6eval/ct/ipsec-udp/HTR_E_null_hmacmd5.def
-v6eval/ct/ipsec-udp/HTR_E_null_hmacsha1.def
-v6eval/ct/ipsec-udp/HTR_E_null_hmacsha2_256.def
-v6eval/ct/ipsec-udp/HTR_E_rijndaelcbc.def
-v6eval/ct/ipsec-udp/HTR_E_rijndaelcbc_hmacmd5.def
-v6eval/ct/ipsec-udp/HTR_E_rijndaelcbc_hmacsha1.def
-v6eval/ct/ipsec-udp/HTR_E_rijndaelcbc_hmacsha2_256.def
-v6eval/ct/ipsec-udp/HTR_common.def
-v6eval/ct/ipsec-udp/HTR_type.def
-v6eval/ct/ipsec-udp/INDEX_host
-v6eval/ct/ipsec-udp/INDEX_host_common
-v6eval/ct/ipsec-udp/INDEX_host_esp
-v6eval/ct/ipsec-udp/Makefile
-v6eval/ct/ipsec-udp/index.html
-v6eval/ct/ipsec-udp/ipsecaddr.def
-v6eval/ct/ipsec-udp/ipsecaddr.def.tmpl
-v6eval/ct/ipsec/.footer
-v6eval/ct/ipsec/00README
-v6eval/ct/ipsec/BEGIN.seq
-v6eval/ct/ipsec/HTR_A_2SA_DspiDip.def
-v6eval/ct/ipsec/HTR_A_2SA_DspiSip.def
-v6eval/ct/ipsec/HTR_A_2SA_SspiDip.def
-v6eval/ct/ipsec/HTR_A_DM_DSTH2_optdata.def
-v6eval/ct/ipsec/HTR_A_DM_DSTH_optdata.def
-v6eval/ct/ipsec/HTR_A_DM_DSTH_optlen.def
-v6eval/ct/ipsec/HTR_A_DM_DSTH_opttype.def
-v6eval/ct/ipsec/HTR_A_DM_HBHH_optdata.def
-v6eval/ct/ipsec/HTR_A_DM_HBHH_optlen.def
-v6eval/ct/ipsec/HTR_A_DM_HBHH_opttype.def
-v6eval/ct/ipsec/HTR_A_DM_IPv6H.def
-v6eval/ct/ipsec/HTR_A_DM_Payload.def
-v6eval/ct/ipsec/HTR_A_DM_RH.def
-v6eval/ct/ipsec/HTR_A_Fragment.def
-v6eval/ct/ipsec/HTR_A_In_2SA_DspiDipsrc.html
-v6eval/ct/ipsec/HTR_A_In_2SA_DspiDipsrc.seq
-v6eval/ct/ipsec/HTR_A_In_2SA_DspiSipsrc.html
-v6eval/ct/ipsec/HTR_A_In_2SA_DspiSipsrc.seq
-v6eval/ct/ipsec/HTR_A_In_DM_DSTH_optdata.html
-v6eval/ct/ipsec/HTR_A_In_DM_DSTH_optdata.seq
-v6eval/ct/ipsec/HTR_A_In_DM_DSTH_optlen.html
-v6eval/ct/ipsec/HTR_A_In_DM_DSTH_optlen.seq
-v6eval/ct/ipsec/HTR_A_In_DM_DSTH_opttype.html
-v6eval/ct/ipsec/HTR_A_In_DM_DSTH_opttype.seq
-v6eval/ct/ipsec/HTR_A_In_DM_HBHH_optdata.html
-v6eval/ct/ipsec/HTR_A_In_DM_HBHH_optdata.seq
-v6eval/ct/ipsec/HTR_A_In_DM_HBHH_optlen.html
-v6eval/ct/ipsec/HTR_A_In_DM_HBHH_optlen.seq
-v6eval/ct/ipsec/HTR_A_In_DM_HBHH_opttype.html
-v6eval/ct/ipsec/HTR_A_In_DM_HBHH_opttype.seq
-v6eval/ct/ipsec/HTR_A_In_DM_IPv6H_dst.html
-v6eval/ct/ipsec/HTR_A_In_DM_IPv6H_dst.seq
-v6eval/ct/ipsec/HTR_A_In_DM_IPv6H_hlim.html
-v6eval/ct/ipsec/HTR_A_In_DM_IPv6H_hlim.seq
-v6eval/ct/ipsec/HTR_A_In_DM_IPv6H_src.html
-v6eval/ct/ipsec/HTR_A_In_DM_IPv6H_src.seq
-v6eval/ct/ipsec/HTR_A_In_DM_Payload.html
-v6eval/ct/ipsec/HTR_A_In_DM_Payload.seq
-v6eval/ct/ipsec/HTR_A_In_DM_RH_ipv6h_dst.html
-v6eval/ct/ipsec/HTR_A_In_DM_RH_ipv6h_dst.seq
-v6eval/ct/ipsec/HTR_A_In_DM_RH_lastaddr.html
-v6eval/ct/ipsec/HTR_A_In_DM_RH_lastaddr.seq
-v6eval/ct/ipsec/HTR_A_In_Fragment.html
-v6eval/ct/ipsec/HTR_A_In_Fragment.seq
-v6eval/ct/ipsec/HTR_A_In_hmacmd5.html
-v6eval/ct/ipsec/HTR_A_In_hmacmd5.seq
-v6eval/ct/ipsec/HTR_A_In_hmacsha1.html
-v6eval/ct/ipsec/HTR_A_In_hmacsha1.seq
-v6eval/ct/ipsec/HTR_A_Input.seq
-v6eval/ct/ipsec/HTR_A_Out_2SA_DspiDipdst.html
-v6eval/ct/ipsec/HTR_A_Out_2SA_DspiDipdst.seq
-v6eval/ct/ipsec/HTR_A_Out_2SA_SspiDipdst.html
-v6eval/ct/ipsec/HTR_A_Out_2SA_SspiDipdst.seq
-v6eval/ct/ipsec/HTR_A_Out_Fragment.html
-v6eval/ct/ipsec/HTR_A_Out_Fragment.seq
-v6eval/ct/ipsec/HTR_A_Out_hmacmd5.html
-v6eval/ct/ipsec/HTR_A_Out_hmacmd5.seq
-v6eval/ct/ipsec/HTR_A_Out_hmacsha1.html
-v6eval/ct/ipsec/HTR_A_Out_hmacsha1.seq
-v6eval/ct/ipsec/HTR_A_Output.seq
-v6eval/ct/ipsec/HTR_A_SPD_discard_none.def
-v6eval/ct/ipsec/HTR_A_common.def
-v6eval/ct/ipsec/HTR_A_hmacmd5.def
-v6eval/ct/ipsec/HTR_A_hmacsha1.def
-v6eval/ct/ipsec/HTR_C_2SA_SspiSipDproto.def
-v6eval/ct/ipsec/HTR_C_In_2SA_SspiSipsrcDproto.html
-v6eval/ct/ipsec/HTR_C_In_2SA_SspiSipsrcDproto.seq
-v6eval/ct/ipsec/HTR_C_In_3descbc_SPD_discard_none.html
-v6eval/ct/ipsec/HTR_C_In_3descbc_SPD_discard_none.seq
-v6eval/ct/ipsec/HTR_C_In_SPD_discard_none.html
-v6eval/ct/ipsec/HTR_C_In_SPD_discard_none.seq
-v6eval/ct/ipsec/HTR_C_In_ah_esp.html
-v6eval/ct/ipsec/HTR_C_In_ah_esp.seq
-v6eval/ct/ipsec/HTR_C_In_descbc_SPD_discard_none.html
-v6eval/ct/ipsec/HTR_C_In_descbc_SPD_discard_none.seq
-v6eval/ct/ipsec/HTR_C_In_rijndaelcbc_SPD_discard_none.html
-v6eval/ct/ipsec/HTR_C_In_rijndaelcbc_SPD_discard_none.seq
-v6eval/ct/ipsec/HTR_C_Out_3descbc_SPD_discard_none.html
-v6eval/ct/ipsec/HTR_C_Out_3descbc_SPD_discard_none.seq
-v6eval/ct/ipsec/HTR_C_Out_SPD_discard_none.html
-v6eval/ct/ipsec/HTR_C_Out_SPD_discard_none.seq
-v6eval/ct/ipsec/HTR_C_Out_ah_esp.html
-v6eval/ct/ipsec/HTR_C_Out_ah_esp.seq
-v6eval/ct/ipsec/HTR_C_Out_descbc_SPD_discard_none.html
-v6eval/ct/ipsec/HTR_C_Out_descbc_SPD_discard_none.seq
-v6eval/ct/ipsec/HTR_C_Out_rijndaelcbc_SPD_discard_none.html
-v6eval/ct/ipsec/HTR_C_Out_rijndaelcbc_SPD_discard_none.seq
-v6eval/ct/ipsec/HTR_C_ah_esp.def
-v6eval/ct/ipsec/HTR_EG_common.def
-v6eval/ct/ipsec/HTR_E_2SA_DspiDip.def
-v6eval/ct/ipsec/HTR_E_2SA_DspiDip_3descbc.def
-v6eval/ct/ipsec/HTR_E_2SA_DspiDip_descbc.def
-v6eval/ct/ipsec/HTR_E_2SA_DspiDip_rijndaelcbc.def
-v6eval/ct/ipsec/HTR_E_2SA_DspiSip.def
-v6eval/ct/ipsec/HTR_E_2SA_DspiSip_3descbc.def
-v6eval/ct/ipsec/HTR_E_2SA_DspiSip_descbc.def
-v6eval/ct/ipsec/HTR_E_2SA_DspiSip_rijndaelcbc.def
-v6eval/ct/ipsec/HTR_E_2SA_SspiDip.def
-v6eval/ct/ipsec/HTR_E_2SA_SspiDip_3descbc.def
-v6eval/ct/ipsec/HTR_E_2SA_SspiDip_descbc.def
-v6eval/ct/ipsec/HTR_E_2SA_SspiDip_rijndaelcbc.def
-v6eval/ct/ipsec/HTR_E_3descbc.def
-v6eval/ct/ipsec/HTR_E_3descbc_hmacmd5.def
-v6eval/ct/ipsec/HTR_E_3descbc_hmacsha1.def
-v6eval/ct/ipsec/HTR_E_3descbc_hmacsha2_256.def
-v6eval/ct/ipsec/HTR_E_AuthKey.def
-v6eval/ct/ipsec/HTR_E_AuthKey_hmacmd5.def
-v6eval/ct/ipsec/HTR_E_AuthKey_hmacsha1.def
-v6eval/ct/ipsec/HTR_E_AuthKey_hmacsha2_256.def
-v6eval/ct/ipsec/HTR_E_DuplicateSequence.def
-v6eval/ct/ipsec/HTR_E_EncryptKey.def
-v6eval/ct/ipsec/HTR_E_EncryptKey_3descbc.def
-v6eval/ct/ipsec/HTR_E_EncryptKey_descbc.def
-v6eval/ct/ipsec/HTR_E_EncryptKey_rijndaelcbc.def
-v6eval/ct/ipsec/HTR_E_Fragment.def
-v6eval/ct/ipsec/HTR_E_Fragment_hmacmd5.def
-v6eval/ct/ipsec/HTR_E_Fragment_hmacsha1.def
-v6eval/ct/ipsec/HTR_E_Fragment_hmacsha2_256.def
-v6eval/ct/ipsec/HTR_E_In_2SA_DspiDipsrc_3descbc.html
-v6eval/ct/ipsec/HTR_E_In_2SA_DspiDipsrc_3descbc.seq
-v6eval/ct/ipsec/HTR_E_In_2SA_DspiDipsrc_descbc.html
-v6eval/ct/ipsec/HTR_E_In_2SA_DspiDipsrc_descbc.seq
-v6eval/ct/ipsec/HTR_E_In_2SA_DspiDipsrc_rijndaelcbc.html
-v6eval/ct/ipsec/HTR_E_In_2SA_DspiDipsrc_rijndaelcbc.seq
-v6eval/ct/ipsec/HTR_E_In_2SA_DspiSipsrc_3descbc.html
-v6eval/ct/ipsec/HTR_E_In_2SA_DspiSipsrc_3descbc.seq
-v6eval/ct/ipsec/HTR_E_In_2SA_DspiSipsrc_descbc.html
-v6eval/ct/ipsec/HTR_E_In_2SA_DspiSipsrc_descbc.seq
-v6eval/ct/ipsec/HTR_E_In_2SA_DspiSipsrc_rijndaelcbc.html
-v6eval/ct/ipsec/HTR_E_In_2SA_DspiSipsrc_rijndaelcbc.seq
-v6eval/ct/ipsec/HTR_E_In_3descbc.html
-v6eval/ct/ipsec/HTR_E_In_3descbc.seq
-v6eval/ct/ipsec/HTR_E_In_3descbc_hmacmd5.html
-v6eval/ct/ipsec/HTR_E_In_3descbc_hmacmd5.seq
-v6eval/ct/ipsec/HTR_E_In_3descbc_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_In_3descbc_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_In_3descbc_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_In_3descbc_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_In_AuthKey_hmacmd5.html
-v6eval/ct/ipsec/HTR_E_In_AuthKey_hmacmd5.seq
-v6eval/ct/ipsec/HTR_E_In_AuthKey_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_In_AuthKey_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_In_AuthKey_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_In_AuthKey_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_In_DuplicateSequence.html
-v6eval/ct/ipsec/HTR_E_In_DuplicateSequence.seq
-v6eval/ct/ipsec/HTR_E_In_EncryptKey_3descbc.html
-v6eval/ct/ipsec/HTR_E_In_EncryptKey_3descbc.seq
-v6eval/ct/ipsec/HTR_E_In_EncryptKey_descbc.html
-v6eval/ct/ipsec/HTR_E_In_EncryptKey_descbc.seq
-v6eval/ct/ipsec/HTR_E_In_EncryptKey_rijndaelcbc.html
-v6eval/ct/ipsec/HTR_E_In_EncryptKey_rijndaelcbc.seq
-v6eval/ct/ipsec/HTR_E_In_Fragment_hmacmd5.html
-v6eval/ct/ipsec/HTR_E_In_Fragment_hmacmd5.seq
-v6eval/ct/ipsec/HTR_E_In_Fragment_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_In_Fragment_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_In_Fragment_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_In_Fragment_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_In_InvalidPadding_3descbc.html
-v6eval/ct/ipsec/HTR_E_In_InvalidPadding_3descbc.seq
-v6eval/ct/ipsec/HTR_E_In_InvalidPadding_descbc.html
-v6eval/ct/ipsec/HTR_E_In_InvalidPadding_descbc.seq
-v6eval/ct/ipsec/HTR_E_In_InvalidPadding_rijndaelcbc.html
-v6eval/ct/ipsec/HTR_E_In_InvalidPadding_rijndaelcbc.seq
-v6eval/ct/ipsec/HTR_E_In_LifetimeSAByte.html
-v6eval/ct/ipsec/HTR_E_In_LifetimeSAByte.seq
-v6eval/ct/ipsec/HTR_E_In_LifetimeSATime.html
-v6eval/ct/ipsec/HTR_E_In_LifetimeSATime.seq
-v6eval/ct/ipsec/HTR_E_In_PadLen255_3descbc.html
-v6eval/ct/ipsec/HTR_E_In_PadLen255_3descbc.seq
-v6eval/ct/ipsec/HTR_E_In_PadLen255_descbc.html
-v6eval/ct/ipsec/HTR_E_In_PadLen255_descbc.seq
-v6eval/ct/ipsec/HTR_E_In_PadLen255_rijndaelcbc.html
-v6eval/ct/ipsec/HTR_E_In_PadLen255_rijndaelcbc.seq
-v6eval/ct/ipsec/HTR_E_In_Padding_3descbc.html
-v6eval/ct/ipsec/HTR_E_In_Padding_3descbc.seq
-v6eval/ct/ipsec/HTR_E_In_Padding_3descbc_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_In_Padding_3descbc_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_In_Padding_3descbc_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_In_Padding_3descbc_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_In_Padding_descbc.html
-v6eval/ct/ipsec/HTR_E_In_Padding_descbc.seq
-v6eval/ct/ipsec/HTR_E_In_Padding_descbc_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_In_Padding_descbc_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_In_Padding_descbc_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_In_Padding_descbc_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_In_Padding_null_hmacmd5.html
-v6eval/ct/ipsec/HTR_E_In_Padding_null_hmacmd5.seq
-v6eval/ct/ipsec/HTR_E_In_Padding_null_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_In_Padding_null_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_In_Padding_null_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_In_Padding_null_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_In_Padding_rijndaelcbc.html
-v6eval/ct/ipsec/HTR_E_In_Padding_rijndaelcbc.seq
-v6eval/ct/ipsec/HTR_E_In_Padding_rijndaelcbc_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_In_Padding_rijndaelcbc_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_In_Padding_rijndaelcbc_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_In_Padding_rijndaelcbc_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_In_ReceiveWindow.html
-v6eval/ct/ipsec/HTR_E_In_ReceiveWindow.seq
-v6eval/ct/ipsec/HTR_E_In_SelectUpperProtICMP.seq
-v6eval/ct/ipsec/HTR_E_In_SelectUpperProtTCP.seq
-v6eval/ct/ipsec/HTR_E_In_SelectUpperProtTCPPort.seq
-v6eval/ct/ipsec/HTR_E_In_SelectUpperProtUDP.seq
-v6eval/ct/ipsec/HTR_E_In_SelectUpperProtUDPPort.seq
-v6eval/ct/ipsec/HTR_E_In_SlideReceiveWindow.html
-v6eval/ct/ipsec/HTR_E_In_SlideReceiveWindow.seq
-v6eval/ct/ipsec/HTR_E_In_descbc.html
-v6eval/ct/ipsec/HTR_E_In_descbc.seq
-v6eval/ct/ipsec/HTR_E_In_descbc_hmacmd5.html
-v6eval/ct/ipsec/HTR_E_In_descbc_hmacmd5.seq
-v6eval/ct/ipsec/HTR_E_In_descbc_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_In_descbc_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_In_descbc_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_In_descbc_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_In_null_hmacmd5.html
-v6eval/ct/ipsec/HTR_E_In_null_hmacmd5.seq
-v6eval/ct/ipsec/HTR_E_In_null_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_In_null_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_In_null_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_In_null_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_In_rijndaelcbc.html
-v6eval/ct/ipsec/HTR_E_In_rijndaelcbc.seq
-v6eval/ct/ipsec/HTR_E_In_rijndaelcbc_hmacmd5.html
-v6eval/ct/ipsec/HTR_E_In_rijndaelcbc_hmacmd5.seq
-v6eval/ct/ipsec/HTR_E_In_rijndaelcbc_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_In_rijndaelcbc_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_In_rijndaelcbc_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_In_rijndaelcbc_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_InvalidPadding.def
-v6eval/ct/ipsec/HTR_E_InvalidPadding_3descbc.def
-v6eval/ct/ipsec/HTR_E_InvalidPadding_descbc.def
-v6eval/ct/ipsec/HTR_E_InvalidPadding_rijndaelcbc.def
-v6eval/ct/ipsec/HTR_E_LifetimeSA.def
-v6eval/ct/ipsec/HTR_E_Out_2SA_DspiDipdst_3descbc.html
-v6eval/ct/ipsec/HTR_E_Out_2SA_DspiDipdst_3descbc.seq
-v6eval/ct/ipsec/HTR_E_Out_2SA_DspiDipdst_descbc.html
-v6eval/ct/ipsec/HTR_E_Out_2SA_DspiDipdst_descbc.seq
-v6eval/ct/ipsec/HTR_E_Out_2SA_DspiDipdst_rijndaelcbc.html
-v6eval/ct/ipsec/HTR_E_Out_2SA_DspiDipdst_rijndaelcbc.seq
-v6eval/ct/ipsec/HTR_E_Out_2SA_SspiDipdst_3descbc.html
-v6eval/ct/ipsec/HTR_E_Out_2SA_SspiDipdst_3descbc.seq
-v6eval/ct/ipsec/HTR_E_Out_2SA_SspiDipdst_descbc.html
-v6eval/ct/ipsec/HTR_E_Out_2SA_SspiDipdst_descbc.seq
-v6eval/ct/ipsec/HTR_E_Out_2SA_SspiDipdst_rijndaelcbc.html
-v6eval/ct/ipsec/HTR_E_Out_2SA_SspiDipdst_rijndaelcbc.seq
-v6eval/ct/ipsec/HTR_E_Out_3descbc.html
-v6eval/ct/ipsec/HTR_E_Out_3descbc.seq
-v6eval/ct/ipsec/HTR_E_Out_3descbc_hmacmd5.html
-v6eval/ct/ipsec/HTR_E_Out_3descbc_hmacmd5.seq
-v6eval/ct/ipsec/HTR_E_Out_3descbc_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_Out_3descbc_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_Out_3descbc_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_Out_3descbc_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_Out_Fragment_hmacmd5.html
-v6eval/ct/ipsec/HTR_E_Out_Fragment_hmacmd5.seq
-v6eval/ct/ipsec/HTR_E_Out_Fragment_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_Out_Fragment_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_Out_Fragment_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_Out_Fragment_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_Out_LifetimeSAByte.html
-v6eval/ct/ipsec/HTR_E_Out_LifetimeSAByte.seq
-v6eval/ct/ipsec/HTR_E_Out_LifetimeSATime.html
-v6eval/ct/ipsec/HTR_E_Out_LifetimeSATime.seq
-v6eval/ct/ipsec/HTR_E_Out_Padding_3descbc.html
-v6eval/ct/ipsec/HTR_E_Out_Padding_3descbc.seq
-v6eval/ct/ipsec/HTR_E_Out_Padding_3descbc_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_Out_Padding_3descbc_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_Out_Padding_3descbc_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_Out_Padding_3descbc_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_Out_Padding_descbc.html
-v6eval/ct/ipsec/HTR_E_Out_Padding_descbc.seq
-v6eval/ct/ipsec/HTR_E_Out_Padding_descbc_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_Out_Padding_descbc_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_Out_Padding_descbc_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_Out_Padding_descbc_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_Out_Padding_null_hmacmd5.html
-v6eval/ct/ipsec/HTR_E_Out_Padding_null_hmacmd5.seq
-v6eval/ct/ipsec/HTR_E_Out_Padding_null_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_Out_Padding_null_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_Out_Padding_null_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_Out_Padding_null_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_Out_Padding_rijndaelcbc.html
-v6eval/ct/ipsec/HTR_E_Out_Padding_rijndaelcbc.seq
-v6eval/ct/ipsec/HTR_E_Out_Padding_rijndaelcbc_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_Out_Padding_rijndaelcbc_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_Out_Padding_rijndaelcbc_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_Out_Padding_rijndaelcbc_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_Out_SelectUpperProtICMP.seq
-v6eval/ct/ipsec/HTR_E_Out_SelectUpperProtTCP.seq
-v6eval/ct/ipsec/HTR_E_Out_SelectUpperProtTCPPort.seq
-v6eval/ct/ipsec/HTR_E_Out_SelectUpperProtUDP.seq
-v6eval/ct/ipsec/HTR_E_Out_SelectUpperProtUDPPort.seq
-v6eval/ct/ipsec/HTR_E_Out_SeqCountOverFlow.seq
-v6eval/ct/ipsec/HTR_E_Out_descbc.html
-v6eval/ct/ipsec/HTR_E_Out_descbc.seq
-v6eval/ct/ipsec/HTR_E_Out_descbc_hmacmd5.html
-v6eval/ct/ipsec/HTR_E_Out_descbc_hmacmd5.seq
-v6eval/ct/ipsec/HTR_E_Out_descbc_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_Out_descbc_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_Out_descbc_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_Out_descbc_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_Out_null_hmacmd5.html
-v6eval/ct/ipsec/HTR_E_Out_null_hmacmd5.seq
-v6eval/ct/ipsec/HTR_E_Out_null_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_Out_null_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_Out_null_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_Out_null_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_Out_rijndaelcbc.html
-v6eval/ct/ipsec/HTR_E_Out_rijndaelcbc.seq
-v6eval/ct/ipsec/HTR_E_Out_rijndaelcbc_hmacmd5.html
-v6eval/ct/ipsec/HTR_E_Out_rijndaelcbc_hmacmd5.seq
-v6eval/ct/ipsec/HTR_E_Out_rijndaelcbc_hmacsha1.html
-v6eval/ct/ipsec/HTR_E_Out_rijndaelcbc_hmacsha1.seq
-v6eval/ct/ipsec/HTR_E_Out_rijndaelcbc_hmacsha2_256.html
-v6eval/ct/ipsec/HTR_E_Out_rijndaelcbc_hmacsha2_256.seq
-v6eval/ct/ipsec/HTR_E_PadLen255.def
-v6eval/ct/ipsec/HTR_E_PadLen255_3descbc.def
-v6eval/ct/ipsec/HTR_E_PadLen255_descbc.def
-v6eval/ct/ipsec/HTR_E_PadLen255_rijndaelcbc.def
-v6eval/ct/ipsec/HTR_E_Padding_3descbc.def
-v6eval/ct/ipsec/HTR_E_Padding_3descbc_hmacsha1.def
-v6eval/ct/ipsec/HTR_E_Padding_3descbc_hmacsha2_256.def
-v6eval/ct/ipsec/HTR_E_Padding_descbc.def
-v6eval/ct/ipsec/HTR_E_Padding_descbc_hmacsha1.def
-v6eval/ct/ipsec/HTR_E_Padding_descbc_hmacsha2_256.def
-v6eval/ct/ipsec/HTR_E_Padding_null.def
-v6eval/ct/ipsec/HTR_E_Padding_null_hmacmd5.def
-v6eval/ct/ipsec/HTR_E_Padding_null_hmacsha1.def
-v6eval/ct/ipsec/HTR_E_Padding_null_hmacsha2_256.def
-v6eval/ct/ipsec/HTR_E_Padding_rijndaelcbc.def
-v6eval/ct/ipsec/HTR_E_Padding_rijndaelcbc_hmacsha1.def
-v6eval/ct/ipsec/HTR_E_Padding_rijndaelcbc_hmacsha2_256.def
-v6eval/ct/ipsec/HTR_E_ReceiveWindow.def
-v6eval/ct/ipsec/HTR_E_SPD_discard_none.def
-v6eval/ct/ipsec/HTR_E_SelectUpper.def
-v6eval/ct/ipsec/HTR_E_SeqCountOverFlow.def
-v6eval/ct/ipsec/HTR_E_SlideReceiveWindow.def
-v6eval/ct/ipsec/HTR_E_common.def
-v6eval/ct/ipsec/HTR_E_descbc.def
-v6eval/ct/ipsec/HTR_E_descbc_hmacmd5.def
-v6eval/ct/ipsec/HTR_E_descbc_hmacsha1.def
-v6eval/ct/ipsec/HTR_E_descbc_hmacsha2_256.def
-v6eval/ct/ipsec/HTR_E_null.def
-v6eval/ct/ipsec/HTR_E_null_hmacmd5.def
-v6eval/ct/ipsec/HTR_E_null_hmacsha1.def
-v6eval/ct/ipsec/HTR_E_null_hmacsha2_256.def
-v6eval/ct/ipsec/HTR_E_rijndaelcbc.def
-v6eval/ct/ipsec/HTR_E_rijndaelcbc_hmacmd5.def
-v6eval/ct/ipsec/HTR_E_rijndaelcbc_hmacsha1.def
-v6eval/ct/ipsec/HTR_E_rijndaelcbc_hmacsha2_256.def
-v6eval/ct/ipsec/HTR_G_common.def
-v6eval/ct/ipsec/HTR_SetAddress.html
-v6eval/ct/ipsec/HTR_SetAddress.seq
-v6eval/ct/ipsec/HTR_common.def
-v6eval/ct/ipsec/INDEX_demo
-v6eval/ct/ipsec/INDEX_host
-v6eval/ct/ipsec/INDEX_host_ah
-v6eval/ct/ipsec/INDEX_host_common
-v6eval/ct/ipsec/INDEX_host_esp
-v6eval/ct/ipsec/INDEX_host_granularity
-v6eval/ct/ipsec/INDEX_router
-v6eval/ct/ipsec/INDEX_router_ah
-v6eval/ct/ipsec/INDEX_router_common
-v6eval/ct/ipsec/INDEX_router_esp
-v6eval/ct/ipsec/IPSEC.html
-v6eval/ct/ipsec/IPSEC.pm
-v6eval/ct/ipsec/Makefile
-v6eval/ct/ipsec/RTU_A_2SA_DspiDip.def
-v6eval/ct/ipsec/RTU_A_2SA_DspiSip.def
-v6eval/ct/ipsec/RTU_A_2SA_SspiDip.def
-v6eval/ct/ipsec/RTU_A_DM_DSTH_optdata.def
-v6eval/ct/ipsec/RTU_A_DM_DSTH_optlen.def
-v6eval/ct/ipsec/RTU_A_DM_DSTH_opttype.def
-v6eval/ct/ipsec/RTU_A_DM_HBHH_optdata.def
-v6eval/ct/ipsec/RTU_A_DM_HBHH_optlen.def
-v6eval/ct/ipsec/RTU_A_DM_HBHH_opttype.def
-v6eval/ct/ipsec/RTU_A_DM_IPv6H.def
-v6eval/ct/ipsec/RTU_A_DM_Inner_IPv6H.def
-v6eval/ct/ipsec/RTU_A_DM_Inner_Payload.def
-v6eval/ct/ipsec/RTU_A_DM_RH.def
-v6eval/ct/ipsec/RTU_A_In.html
-v6eval/ct/ipsec/RTU_A_In.seq
-v6eval/ct/ipsec/RTU_A_In_2SA_DspiDipsrc.html
-v6eval/ct/ipsec/RTU_A_In_2SA_DspiDipsrc.seq
-v6eval/ct/ipsec/RTU_A_In_2SA_DspiSipsrc.html
-v6eval/ct/ipsec/RTU_A_In_2SA_DspiSipsrc.seq
-v6eval/ct/ipsec/RTU_A_In_DM_DSTH_optdata.html
-v6eval/ct/ipsec/RTU_A_In_DM_DSTH_optdata.seq
-v6eval/ct/ipsec/RTU_A_In_DM_DSTH_optlen.html
-v6eval/ct/ipsec/RTU_A_In_DM_DSTH_optlen.seq
-v6eval/ct/ipsec/RTU_A_In_DM_DSTH_opttype.html
-v6eval/ct/ipsec/RTU_A_In_DM_DSTH_opttype.seq
-v6eval/ct/ipsec/RTU_A_In_DM_HBHH_optdata.html
-v6eval/ct/ipsec/RTU_A_In_DM_HBHH_optdata.seq
-v6eval/ct/ipsec/RTU_A_In_DM_HBHH_optlen.html
-v6eval/ct/ipsec/RTU_A_In_DM_HBHH_optlen.seq
-v6eval/ct/ipsec/RTU_A_In_DM_HBHH_opttype.html
-v6eval/ct/ipsec/RTU_A_In_DM_HBHH_opttype.seq
-v6eval/ct/ipsec/RTU_A_In_DM_IPv6H_dst.html
-v6eval/ct/ipsec/RTU_A_In_DM_IPv6H_dst.seq
-v6eval/ct/ipsec/RTU_A_In_DM_IPv6H_hlim.html
-v6eval/ct/ipsec/RTU_A_In_DM_IPv6H_hlim.seq
-v6eval/ct/ipsec/RTU_A_In_DM_IPv6H_src.html
-v6eval/ct/ipsec/RTU_A_In_DM_IPv6H_src.seq
-v6eval/ct/ipsec/RTU_A_In_DM_Inner_IPv6H_hlim.html
-v6eval/ct/ipsec/RTU_A_In_DM_Inner_IPv6H_hlim.seq
-v6eval/ct/ipsec/RTU_A_In_DM_Inner_Payload.html
-v6eval/ct/ipsec/RTU_A_In_DM_Inner_Payload.seq
-v6eval/ct/ipsec/RTU_A_In_DM_RH_ipv6h_dst.html
-v6eval/ct/ipsec/RTU_A_In_DM_RH_ipv6h_dst.seq
-v6eval/ct/ipsec/RTU_A_In_DM_RH_lastaddr.html
-v6eval/ct/ipsec/RTU_A_In_DM_RH_lastaddr.seq
-v6eval/ct/ipsec/RTU_A_In_NoSPD.seq
-v6eval/ct/ipsec/RTU_A_In_Order_DSTH.html
-v6eval/ct/ipsec/RTU_A_In_Order_DSTH.seq
-v6eval/ct/ipsec/RTU_A_In_hmacmd5.html
-v6eval/ct/ipsec/RTU_A_In_hmacmd5.seq
-v6eval/ct/ipsec/RTU_A_In_hmacsha1.html
-v6eval/ct/ipsec/RTU_A_In_hmacsha1.seq
-v6eval/ct/ipsec/RTU_A_Order_DSTH.def
-v6eval/ct/ipsec/RTU_A_Out_2SA_DspiDipdst.html
-v6eval/ct/ipsec/RTU_A_Out_2SA_DspiDipdst.seq
-v6eval/ct/ipsec/RTU_A_Out_2SA_SspiDipdst.html
-v6eval/ct/ipsec/RTU_A_Out_2SA_SspiDipdst.seq
-v6eval/ct/ipsec/RTU_A_Out_hmacmd5.html
-v6eval/ct/ipsec/RTU_A_Out_hmacmd5.seq
-v6eval/ct/ipsec/RTU_A_Out_hmacsha1.html
-v6eval/ct/ipsec/RTU_A_Out_hmacsha1.seq
-v6eval/ct/ipsec/RTU_A_common.def
-v6eval/ct/ipsec/RTU_A_hmacmd5.def
-v6eval/ct/ipsec/RTU_A_hmacsha1.def
-v6eval/ct/ipsec/RTU_C_2SA_SspiSipDproto.def
-v6eval/ct/ipsec/RTU_C_In_2SA_SspiSipsrcDproto.html
-v6eval/ct/ipsec/RTU_C_In_2SA_SspiSipsrcDproto.seq
-v6eval/ct/ipsec/RTU_E_2SA_DspiDip.def
-v6eval/ct/ipsec/RTU_E_2SA_DspiSip.def
-v6eval/ct/ipsec/RTU_E_2SA_SspiDip.def
-v6eval/ct/ipsec/RTU_E_3descbc.def
-v6eval/ct/ipsec/RTU_E_3descbc_hmacmd5.def
-v6eval/ct/ipsec/RTU_E_3descbc_hmacsha1.def
-v6eval/ct/ipsec/RTU_E_AuthKey.def
-v6eval/ct/ipsec/RTU_E_EncryptKey.def
-v6eval/ct/ipsec/RTU_E_In.html
-v6eval/ct/ipsec/RTU_E_In.seq
-v6eval/ct/ipsec/RTU_E_In_2SA_DspiDipsrc.html
-v6eval/ct/ipsec/RTU_E_In_2SA_DspiDipsrc.seq
-v6eval/ct/ipsec/RTU_E_In_2SA_DspiSipsrc.html
-v6eval/ct/ipsec/RTU_E_In_2SA_DspiSipsrc.seq
-v6eval/ct/ipsec/RTU_E_In_3descbc.html
-v6eval/ct/ipsec/RTU_E_In_3descbc.seq
-v6eval/ct/ipsec/RTU_E_In_3descbc_hmacmd5.html
-v6eval/ct/ipsec/RTU_E_In_3descbc_hmacmd5.seq
-v6eval/ct/ipsec/RTU_E_In_3descbc_hmacsha1.html
-v6eval/ct/ipsec/RTU_E_In_3descbc_hmacsha1.seq
-v6eval/ct/ipsec/RTU_E_In_AuthKey.html
-v6eval/ct/ipsec/RTU_E_In_AuthKey.seq
-v6eval/ct/ipsec/RTU_E_In_EncryptKey.html
-v6eval/ct/ipsec/RTU_E_In_EncryptKey.seq
-v6eval/ct/ipsec/RTU_E_In_InvalidPadding.html
-v6eval/ct/ipsec/RTU_E_In_InvalidPadding.seq
-v6eval/ct/ipsec/RTU_E_In_Order_DSTH.html
-v6eval/ct/ipsec/RTU_E_In_Order_DSTH.seq
-v6eval/ct/ipsec/RTU_E_In_PadLen255.html
-v6eval/ct/ipsec/RTU_E_In_PadLen255.seq
-v6eval/ct/ipsec/RTU_E_In_Padding_3descbc.html
-v6eval/ct/ipsec/RTU_E_In_Padding_3descbc.seq
-v6eval/ct/ipsec/RTU_E_In_Padding_descbc.html
-v6eval/ct/ipsec/RTU_E_In_Padding_descbc.seq
-v6eval/ct/ipsec/RTU_E_In_Padding_null.html
-v6eval/ct/ipsec/RTU_E_In_Padding_null.seq
-v6eval/ct/ipsec/RTU_E_In_descbc.html
-v6eval/ct/ipsec/RTU_E_In_descbc.seq
-v6eval/ct/ipsec/RTU_E_In_descbc_hmacmd5.html
-v6eval/ct/ipsec/RTU_E_In_descbc_hmacmd5.seq
-v6eval/ct/ipsec/RTU_E_In_descbc_hmacsha1.html
-v6eval/ct/ipsec/RTU_E_In_descbc_hmacsha1.seq
-v6eval/ct/ipsec/RTU_E_In_null_hmacmd5.html
-v6eval/ct/ipsec/RTU_E_In_null_hmacmd5.seq
-v6eval/ct/ipsec/RTU_E_In_null_hmacsha1.html
-v6eval/ct/ipsec/RTU_E_In_null_hmacsha1.seq
-v6eval/ct/ipsec/RTU_E_InvalidPadding.def
-v6eval/ct/ipsec/RTU_E_Order_DSTH.def
-v6eval/ct/ipsec/RTU_E_Out_2SA_DspiDipdst.html
-v6eval/ct/ipsec/RTU_E_Out_2SA_DspiDipdst.seq
-v6eval/ct/ipsec/RTU_E_Out_2SA_SspiDipdst.html
-v6eval/ct/ipsec/RTU_E_Out_2SA_SspiDipdst.seq
-v6eval/ct/ipsec/RTU_E_Out_3descbc.html
-v6eval/ct/ipsec/RTU_E_Out_3descbc.seq
-v6eval/ct/ipsec/RTU_E_Out_3descbc_hmacmd5.html
-v6eval/ct/ipsec/RTU_E_Out_3descbc_hmacmd5.seq
-v6eval/ct/ipsec/RTU_E_Out_3descbc_hmacsha1.html
-v6eval/ct/ipsec/RTU_E_Out_3descbc_hmacsha1.seq
-v6eval/ct/ipsec/RTU_E_Out_Padding_3descbc.html
-v6eval/ct/ipsec/RTU_E_Out_Padding_3descbc.seq
-v6eval/ct/ipsec/RTU_E_Out_Padding_descbc.html
-v6eval/ct/ipsec/RTU_E_Out_Padding_descbc.seq
-v6eval/ct/ipsec/RTU_E_Out_Padding_null.html
-v6eval/ct/ipsec/RTU_E_Out_Padding_null.seq
-v6eval/ct/ipsec/RTU_E_Out_descbc.html
-v6eval/ct/ipsec/RTU_E_Out_descbc.seq
-v6eval/ct/ipsec/RTU_E_Out_descbc_hmacmd5.html
-v6eval/ct/ipsec/RTU_E_Out_descbc_hmacmd5.seq
-v6eval/ct/ipsec/RTU_E_Out_descbc_hmacsha1.html
-v6eval/ct/ipsec/RTU_E_Out_descbc_hmacsha1.seq
-v6eval/ct/ipsec/RTU_E_Out_null_hmacmd5.html
-v6eval/ct/ipsec/RTU_E_Out_null_hmacmd5.seq
-v6eval/ct/ipsec/RTU_E_Out_null_hmacsha1.html
-v6eval/ct/ipsec/RTU_E_Out_null_hmacsha1.seq
-v6eval/ct/ipsec/RTU_E_PadLen255.def
-v6eval/ct/ipsec/RTU_E_Padding_3descbc.def
-v6eval/ct/ipsec/RTU_E_Padding_descbc.def
-v6eval/ct/ipsec/RTU_E_Padding_null.def
-v6eval/ct/ipsec/RTU_E_common.def
-v6eval/ct/ipsec/RTU_E_descbc.def
-v6eval/ct/ipsec/RTU_E_descbc_hmacmd5.def
-v6eval/ct/ipsec/RTU_E_descbc_hmacsha1.def
-v6eval/ct/ipsec/RTU_E_null_hmacmd5.def
-v6eval/ct/ipsec/RTU_E_null_hmacsha1.def
-v6eval/ct/ipsec/RTU_SetAddress.html
-v6eval/ct/ipsec/RTU_SetAddress.seq
-v6eval/ct/ipsec/RTU_common.def
-v6eval/ct/ipsec/index.html
-v6eval/ct/ipsec/ipsecaddr.def
-v6eval/ct/ipsec/ipsecaddr.def.tmpl
-v6eval/ct/ipsec/HTR_A_In_DM_DSTH_optdata_afterAH.html
-v6eval/ct/ipsec4-udp/.footer
-v6eval/ct/ipsec4-udp/00README
-v6eval/ct/ipsec4-udp/HTR_A_2SA_DspiDip.def
-v6eval/ct/ipsec4-udp/HTR_A_2SA_DspiSip.def
-v6eval/ct/ipsec4-udp/HTR_A_2SA_SspiDip.def
-v6eval/ct/ipsec4-udp/HTR_A_DM_IPv4H.def
-v6eval/ct/ipsec4-udp/HTR_A_DM_Payload.def
-v6eval/ct/ipsec4-udp/HTR_A_Fragment.def
-v6eval/ct/ipsec4-udp/HTR_A_In_DM_IPv4H_dst.html
-v6eval/ct/ipsec4-udp/HTR_A_In_DM_IPv4H_dst.seq
-v6eval/ct/ipsec4-udp/HTR_A_In_DM_IPv4H_src.html
-v6eval/ct/ipsec4-udp/HTR_A_In_DM_IPv4H_src.seq
-v6eval/ct/ipsec4-udp/HTR_A_In_DM_IPv4H_ttl.html
-v6eval/ct/ipsec4-udp/HTR_A_In_DM_IPv4H_ttl.seq
-v6eval/ct/ipsec4-udp/HTR_A_In_DM_Payload.html
-v6eval/ct/ipsec4-udp/HTR_A_In_DM_Payload.seq
-v6eval/ct/ipsec4-udp/HTR_A_SPD_discard_none.def
-v6eval/ct/ipsec4-udp/HTR_A_common.def
-v6eval/ct/ipsec4-udp/HTR_A_hmacmd5.def
-v6eval/ct/ipsec4-udp/HTR_A_hmacsha1.def
-v6eval/ct/ipsec4-udp/HTR_C_2SA_SspiSipDproto.def
-v6eval/ct/ipsec4-udp/HTR_C_ah_esp.def
-v6eval/ct/ipsec4-udp/HTR_E_2SA_DspiDip_descbc.def
-v6eval/ct/ipsec4-udp/HTR_E_2SA_DspiSip_descbc.def
-v6eval/ct/ipsec4-udp/HTR_E_2SA_SspiDip_descbc.def
-v6eval/ct/ipsec4-udp/HTR_E_3descbc.def
-v6eval/ct/ipsec4-udp/HTR_E_3descbc_hmacmd5.def
-v6eval/ct/ipsec4-udp/HTR_E_3descbc_hmacsha1.def
-v6eval/ct/ipsec4-udp/HTR_E_AuthKey_hmacmd5.def
-v6eval/ct/ipsec4-udp/HTR_E_EncryptKey_descbc.def
-v6eval/ct/ipsec4-udp/HTR_E_Fragment.def
-v6eval/ct/ipsec4-udp/HTR_E_InvalidPadding_descbc.def
-v6eval/ct/ipsec4-udp/HTR_E_PadLen255_descbc.def
-v6eval/ct/ipsec4-udp/HTR_E_Padding_3descbc.def
-v6eval/ct/ipsec4-udp/HTR_E_Padding_descbc.def
-v6eval/ct/ipsec4-udp/HTR_E_Padding_null_hmacmd5.def
-v6eval/ct/ipsec4-udp/HTR_E_common.def
-v6eval/ct/ipsec4-udp/HTR_E_descbc.def
-v6eval/ct/ipsec4-udp/HTR_E_descbc_hmacmd5.def
-v6eval/ct/ipsec4-udp/HTR_E_descbc_hmacsha1.def
-v6eval/ct/ipsec4-udp/HTR_E_null.def
-v6eval/ct/ipsec4-udp/HTR_E_null_hmacmd5.def
-v6eval/ct/ipsec4-udp/HTR_E_null_hmacsha1.def
-v6eval/ct/ipsec4-udp/HTR_common.def
-v6eval/ct/ipsec4-udp/INDEX_demo
-v6eval/ct/ipsec4-udp/INDEX_host
-v6eval/ct/ipsec4-udp/INDEX_host_ah
-v6eval/ct/ipsec4-udp/INDEX_host_common
-v6eval/ct/ipsec4-udp/INDEX_host_esp
-v6eval/ct/ipsec4-udp/INDEX_router
-v6eval/ct/ipsec4-udp/INDEX_router_ah
-v6eval/ct/ipsec4-udp/INDEX_router_common
-v6eval/ct/ipsec4-udp/INDEX_router_esp
-v6eval/ct/ipsec4-udp/Makefile
-v6eval/ct/ipsec4-udp/RTU_A_2SA_DspiDip.def
-v6eval/ct/ipsec4-udp/RTU_A_2SA_DspiSip.def
-v6eval/ct/ipsec4-udp/RTU_A_2SA_SspiDip.def
-v6eval/ct/ipsec4-udp/RTU_A_DM_IPv4H.def
-v6eval/ct/ipsec4-udp/RTU_A_DM_Inner_IPv4H.def
-v6eval/ct/ipsec4-udp/RTU_A_DM_Inner_Payload.def
-v6eval/ct/ipsec4-udp/RTU_A_In_DM_IPv4H_dst.seq
-v6eval/ct/ipsec4-udp/RTU_A_In_DM_IPv4H_src.seq
-v6eval/ct/ipsec4-udp/RTU_A_In_DM_IPv4H_ttl.seq
-v6eval/ct/ipsec4-udp/RTU_A_In_DM_Inner_IPv4H_ttl.seq
-v6eval/ct/ipsec4-udp/RTU_A_In_DM_Inner_Payload.seq
-v6eval/ct/ipsec4-udp/RTU_A_common.def
-v6eval/ct/ipsec4-udp/RTU_A_hmacmd5.def
-v6eval/ct/ipsec4-udp/RTU_A_hmacsha1.def
-v6eval/ct/ipsec4-udp/RTU_C_2SA_SspiSipDproto.def
-v6eval/ct/ipsec4-udp/RTU_E_2SA_DspiDip.def
-v6eval/ct/ipsec4-udp/RTU_E_2SA_DspiSip.def
-v6eval/ct/ipsec4-udp/RTU_E_2SA_SspiDip.def
-v6eval/ct/ipsec4-udp/RTU_E_3descbc.def
-v6eval/ct/ipsec4-udp/RTU_E_3descbc_hmacmd5.def
-v6eval/ct/ipsec4-udp/RTU_E_3descbc_hmacsha1.def
-v6eval/ct/ipsec4-udp/RTU_E_AuthKey.def
-v6eval/ct/ipsec4-udp/RTU_E_EncryptKey.def
-v6eval/ct/ipsec4-udp/RTU_E_InvalidPadding.def
-v6eval/ct/ipsec4-udp/RTU_E_PadLen255.def
-v6eval/ct/ipsec4-udp/RTU_E_Padding_3descbc.def
-v6eval/ct/ipsec4-udp/RTU_E_Padding_descbc.def
-v6eval/ct/ipsec4-udp/RTU_E_Padding_null.def
-v6eval/ct/ipsec4-udp/RTU_E_common.def
-v6eval/ct/ipsec4-udp/RTU_E_descbc.def
-v6eval/ct/ipsec4-udp/RTU_E_descbc_hmacmd5.def
-v6eval/ct/ipsec4-udp/RTU_E_descbc_hmacsha1.def
-v6eval/ct/ipsec4-udp/RTU_E_null_hmacmd5.def
-v6eval/ct/ipsec4-udp/RTU_E_null_hmacsha1.def
-v6eval/ct/ipsec4-udp/RTU_common.def
-v6eval/ct/ipsec4-udp/index.html
-v6eval/ct/ipsec4-udp/ipsecaddr.def
-v6eval/ct/ipsec4/.footer
-v6eval/ct/ipsec4/00README
-v6eval/ct/ipsec4/HTR_A_DM_IPv4H.def
-v6eval/ct/ipsec4/HTR_A_DM_Payload.def
-v6eval/ct/ipsec4/HTR_A_In_DM_IPv4H_dst.html
-v6eval/ct/ipsec4/HTR_A_In_DM_IPv4H_dst.seq
-v6eval/ct/ipsec4/HTR_A_In_DM_IPv4H_src.html
-v6eval/ct/ipsec4/HTR_A_In_DM_IPv4H_src.seq
-v6eval/ct/ipsec4/HTR_A_In_DM_IPv4H_ttl.html
-v6eval/ct/ipsec4/HTR_A_In_DM_IPv4H_ttl.seq
-v6eval/ct/ipsec4/HTR_A_In_DM_Payload.html
-v6eval/ct/ipsec4/HTR_A_In_DM_Payload.seq
-v6eval/ct/ipsec4/INDEX_demo
-v6eval/ct/ipsec4/INDEX_host
-v6eval/ct/ipsec4/INDEX_host_ah
-v6eval/ct/ipsec4/INDEX_host_common
-v6eval/ct/ipsec4/INDEX_host_esp
-v6eval/ct/ipsec4/INDEX_router
-v6eval/ct/ipsec4/INDEX_router_ah
-v6eval/ct/ipsec4/INDEX_router_common
-v6eval/ct/ipsec4/INDEX_router_esp
-v6eval/ct/ipsec4/Makefile
-v6eval/ct/ipsec4/RTU_A_DM_IPv4H.def
-v6eval/ct/ipsec4/RTU_A_DM_Inner_IPv4H.def
-v6eval/ct/ipsec4/RTU_A_DM_Inner_Payload.def
-v6eval/ct/ipsec4/RTU_A_In_DM_IPv4H_dst.html
-v6eval/ct/ipsec4/RTU_A_In_DM_IPv4H_dst.seq
-v6eval/ct/ipsec4/RTU_A_In_DM_IPv4H_src.html
-v6eval/ct/ipsec4/RTU_A_In_DM_IPv4H_src.seq
-v6eval/ct/ipsec4/RTU_A_In_DM_IPv4H_ttl.html
-v6eval/ct/ipsec4/RTU_A_In_DM_IPv4H_ttl.seq
-v6eval/ct/ipsec4/RTU_A_In_DM_Inner_IPv4H_ttl.html
-v6eval/ct/ipsec4/RTU_A_In_DM_Inner_IPv4H_ttl.seq
-v6eval/ct/ipsec4/RTU_A_In_DM_Inner_Payload.html
-v6eval/ct/ipsec4/RTU_A_In_DM_Inner_Payload.seq
-v6eval/ct/ipsec4/index.html
-v6eval/ct/ipsec4/ipsecaddr.def
-v6eval/ct/mip6-cn-20/.footer
-v6eval/ct/mip6-cn-20/BE_NoBinding.def
-v6eval/ct/mip6-cn-20/BE_NoBinding.html
-v6eval/ct/mip6-cn-20/BE_NoBinding.seq
-v6eval/ct/mip6-cn-20/BE_UnknownType.def
-v6eval/ct/mip6-cn-20/BE_UnknownType.html
-v6eval/ct/mip6-cn-20/BE_UnknownType.seq
-v6eval/ct/mip6-cn-20/BU_A0_H0.def
-v6eval/ct/mip6-cn-20/BU_A0_H0.html
-v6eval/ct/mip6-cn-20/BU_A0_H0.seq
-v6eval/ct/mip6-cn-20/BU_A0_H1.def
-v6eval/ct/mip6-cn-20/BU_A0_H1.html
-v6eval/ct/mip6-cn-20/BU_A0_H1.seq
-v6eval/ct/mip6-cn-20/BU_A1_H0.def
-v6eval/ct/mip6-cn-20/BU_A1_H0.html
-v6eval/ct/mip6-cn-20/BU_A1_H0.seq
-v6eval/ct/mip6-cn-20/BU_A1_H1.def
-v6eval/ct/mip6-cn-20/BU_A1_H1.html
-v6eval/ct/mip6-cn-20/BU_A1_H1.seq
-v6eval/ct/mip6-cn-20/BU_InvalidChecksum_A0.def
-v6eval/ct/mip6-cn-20/BU_InvalidChecksum_A0.html
-v6eval/ct/mip6-cn-20/BU_InvalidChecksum_A0.seq
-v6eval/ct/mip6-cn-20/BU_InvalidChecksum_A1.def
-v6eval/ct/mip6-cn-20/BU_InvalidChecksum_A1.html
-v6eval/ct/mip6-cn-20/BU_InvalidChecksum_A1.seq
-v6eval/ct/mip6-cn-20/BU_Piggyback_A0.def
-v6eval/ct/mip6-cn-20/BU_Piggyback_A0.html
-v6eval/ct/mip6-cn-20/BU_Piggyback_A0.seq
-v6eval/ct/mip6-cn-20/BU_Piggyback_A0_BCE.def
-v6eval/ct/mip6-cn-20/BU_Piggyback_A0_BCE.html
-v6eval/ct/mip6-cn-20/BU_Piggyback_A0_BCE.seq
-v6eval/ct/mip6-cn-20/BU_Piggyback_A1.def
-v6eval/ct/mip6-cn-20/BU_Piggyback_A1.html
-v6eval/ct/mip6-cn-20/BU_Piggyback_A1.seq
-v6eval/ct/mip6-cn-20/BU_Piggyback_A1_BCE.def
-v6eval/ct/mip6-cn-20/BU_Piggyback_A1_BCE.html
-v6eval/ct/mip6-cn-20/BU_Piggyback_A1_BCE.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_A0.def
-v6eval/ct/mip6-cn-20/BU_SEQ_A0.html
-v6eval/ct/mip6-cn-20/BU_SEQ_A0.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_A0_MAX.def
-v6eval/ct/mip6-cn-20/BU_SEQ_A0_MAX.html
-v6eval/ct/mip6-cn-20/BU_SEQ_A0_MAX.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_A1.def
-v6eval/ct/mip6-cn-20/BU_SEQ_A1.html
-v6eval/ct/mip6-cn-20/BU_SEQ_A1.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_A1_MAX.def
-v6eval/ct/mip6-cn-20/BU_SEQ_A1_MAX.html
-v6eval/ct/mip6-cn-20/BU_SEQ_A1_MAX.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_EQ_A0.def
-v6eval/ct/mip6-cn-20/BU_SEQ_EQ_A0.html
-v6eval/ct/mip6-cn-20/BU_SEQ_EQ_A0.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_EQ_A1.def
-v6eval/ct/mip6-cn-20/BU_SEQ_EQ_A1.html
-v6eval/ct/mip6-cn-20/BU_SEQ_EQ_A1.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_LESS_A0.def
-v6eval/ct/mip6-cn-20/BU_SEQ_LESS_A0.html
-v6eval/ct/mip6-cn-20/BU_SEQ_LESS_A0.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_LESS_A1.def
-v6eval/ct/mip6-cn-20/BU_SEQ_LESS_A1.html
-v6eval/ct/mip6-cn-20/BU_SEQ_LESS_A1.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_MORE_A0.def
-v6eval/ct/mip6-cn-20/BU_SEQ_MORE_A0.html
-v6eval/ct/mip6-cn-20/BU_SEQ_MORE_A0.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_MORE_A1.def
-v6eval/ct/mip6-cn-20/BU_SEQ_MORE_A1.html
-v6eval/ct/mip6-cn-20/BU_SEQ_MORE_A1.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_A0.def
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_A0.html
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_A0.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_A0_MAX.def
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_A0_MAX.html
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_A0_MAX.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_A1.def
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_A1.html
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_A1.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_A1_MAX.def
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_A1_MAX.html
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_A1_MAX.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_EQ_A0.def
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_EQ_A0.html
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_EQ_A0.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_EQ_A1.def
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_EQ_A1.html
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_EQ_A1.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_LESS_A0.def
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_LESS_A0.html
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_LESS_A0.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_LESS_A1.def
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_LESS_A1.html
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_LESS_A1.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_MORE_A0.def
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_MORE_A0.html
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_MORE_A0.seq
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_MORE_A1.def
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_MORE_A1.html
-v6eval/ct/mip6-cn-20/BU_SEQ_OVERFLOW_MORE_A1.seq
-v6eval/ct/mip6-cn-20/CoTI_BCE.def
-v6eval/ct/mip6-cn-20/CoTI_BCE.html
-v6eval/ct/mip6-cn-20/CoTI_BCE.seq
-v6eval/ct/mip6-cn-20/CoTI_HaO.def
-v6eval/ct/mip6-cn-20/CoTI_HaO.html
-v6eval/ct/mip6-cn-20/CoTI_HaO.seq
-v6eval/ct/mip6-cn-20/CoTI_InvalidChecksum.def
-v6eval/ct/mip6-cn-20/CoTI_InvalidChecksum.html
-v6eval/ct/mip6-cn-20/CoTI_InvalidChecksum.seq
-v6eval/ct/mip6-cn-20/CoTI_Piggyback.def
-v6eval/ct/mip6-cn-20/CoTI_Piggyback.html
-v6eval/ct/mip6-cn-20/CoTI_Piggyback.seq
-v6eval/ct/mip6-cn-20/CoTI_Piggyback_BCE.def
-v6eval/ct/mip6-cn-20/CoTI_Piggyback_BCE.html
-v6eval/ct/mip6-cn-20/CoTI_Piggyback_BCE.seq
-v6eval/ct/mip6-cn-20/CoTI_Valid.def
-v6eval/ct/mip6-cn-20/CoTI_Valid.html
-v6eval/ct/mip6-cn-20/CoTI_Valid.seq
-v6eval/ct/mip6-cn-20/Delete_LT0_FOREIGN.def
-v6eval/ct/mip6-cn-20/Delete_LT0_FOREIGN.html
-v6eval/ct/mip6-cn-20/Delete_LT0_FOREIGN.seq
-v6eval/ct/mip6-cn-20/Delete_LT0_HOME.def
-v6eval/ct/mip6-cn-20/Delete_LT0_HOME.html
-v6eval/ct/mip6-cn-20/Delete_LT0_HOME.seq
-v6eval/ct/mip6-cn-20/Delete_LT0_HOME_without_HaO.def
-v6eval/ct/mip6-cn-20/Delete_LT0_HOME_without_HaO.html
-v6eval/ct/mip6-cn-20/Delete_LT0_HOME_without_HaO.seq
-v6eval/ct/mip6-cn-20/Delete_LT1_HOME.def
-v6eval/ct/mip6-cn-20/Delete_LT1_HOME.html
-v6eval/ct/mip6-cn-20/Delete_LT1_HOME.seq
-v6eval/ct/mip6-cn-20/Delete_LT1_HOME_without_HaO.def
-v6eval/ct/mip6-cn-20/Delete_LT1_HOME_without_HaO.html
-v6eval/ct/mip6-cn-20/Delete_LT1_HOME_without_HaO.seq
-v6eval/ct/mip6-cn-20/HoTI_BCE.def
-v6eval/ct/mip6-cn-20/HoTI_BCE.html
-v6eval/ct/mip6-cn-20/HoTI_BCE.seq
-v6eval/ct/mip6-cn-20/HoTI_HaO.def
-v6eval/ct/mip6-cn-20/HoTI_HaO.html
-v6eval/ct/mip6-cn-20/HoTI_HaO.seq
-v6eval/ct/mip6-cn-20/HoTI_InvalidChecksum.def
-v6eval/ct/mip6-cn-20/HoTI_InvalidChecksum.html
-v6eval/ct/mip6-cn-20/HoTI_InvalidChecksum.seq
-v6eval/ct/mip6-cn-20/HoTI_Piggyback.def
-v6eval/ct/mip6-cn-20/HoTI_Piggyback.html
-v6eval/ct/mip6-cn-20/HoTI_Piggyback.seq
-v6eval/ct/mip6-cn-20/HoTI_Piggyback_BCE.def
-v6eval/ct/mip6-cn-20/HoTI_Piggyback_BCE.html
-v6eval/ct/mip6-cn-20/HoTI_Piggyback_BCE.seq
-v6eval/ct/mip6-cn-20/HoTI_Valid.def
-v6eval/ct/mip6-cn-20/HoTI_Valid.html
-v6eval/ct/mip6-cn-20/HoTI_Valid.seq
-v6eval/ct/mip6-cn-20/INDEX
-v6eval/ct/mip6-cn-20/Initialization.def
-v6eval/ct/mip6-cn-20/Initialization.html
-v6eval/ct/mip6-cn-20/Initialization.seq
-v6eval/ct/mip6-cn-20/MIP6.def
-v6eval/ct/mip6-cn-20/MIP6.pm
-v6eval/ct/mip6-cn-20/Makefile
-v6eval/ct/mip6-cn-20/RR_Valid.def
-v6eval/ct/mip6-cn-20/RR_Valid.html
-v6eval/ct/mip6-cn-20/RR_Valid.seq
-v6eval/ct/mip6-cn-20/index.html
-v6eval/ct/mip6-ha-20/.footer
-v6eval/ct/mip6-ha-20/BE_UnknownType.def
-v6eval/ct/mip6-ha-20/BE_UnknownType.html
-v6eval/ct/mip6-ha-20/BE_UnknownType.seq
-v6eval/ct/mip6-ha-20/BU_DAD_Failed_S0_L0.def
-v6eval/ct/mip6-ha-20/BU_DAD_Failed_S0_L0.html
-v6eval/ct/mip6-ha-20/BU_DAD_Failed_S0_L0.seq
-v6eval/ct/mip6-ha-20/BU_DAD_Failed_S0_L1.def
-v6eval/ct/mip6-ha-20/BU_DAD_Failed_S0_L1.html
-v6eval/ct/mip6-ha-20/BU_DAD_Failed_S0_L1.seq
-v6eval/ct/mip6-ha-20/BU_DAD_S0_L0.def
-v6eval/ct/mip6-ha-20/BU_DAD_S0_L0.html
-v6eval/ct/mip6-ha-20/BU_DAD_S0_L0.seq
-v6eval/ct/mip6-ha-20/BU_DAD_S0_L1.def
-v6eval/ct/mip6-ha-20/BU_DAD_S0_L1.html
-v6eval/ct/mip6-ha-20/BU_DAD_S0_L1.seq
-v6eval/ct/mip6-ha-20/BU_InvalidChecksum.def
-v6eval/ct/mip6-ha-20/BU_InvalidChecksum.html
-v6eval/ct/mip6-ha-20/BU_InvalidChecksum.seq
-v6eval/ct/mip6-ha-20/BU_NA_S0_L0.def
-v6eval/ct/mip6-ha-20/BU_NA_S0_L0.html
-v6eval/ct/mip6-ha-20/BU_NA_S0_L0.seq
-v6eval/ct/mip6-ha-20/BU_NA_S0_L1.def
-v6eval/ct/mip6-ha-20/BU_NA_S0_L1.html
-v6eval/ct/mip6-ha-20/BU_NA_S0_L1.seq
-v6eval/ct/mip6-ha-20/BU_ND_S0_L0.def
-v6eval/ct/mip6-ha-20/BU_ND_S0_L0.html
-v6eval/ct/mip6-ha-20/BU_ND_S0_L0.seq
-v6eval/ct/mip6-ha-20/BU_ND_S0_L1.def
-v6eval/ct/mip6-ha-20/BU_ND_S0_L1.html
-v6eval/ct/mip6-ha-20/BU_ND_S0_L1.seq
-v6eval/ct/mip6-ha-20/BU_NotHomeSubnet_A0.def
-v6eval/ct/mip6-ha-20/BU_NotHomeSubnet_A0.html
-v6eval/ct/mip6-ha-20/BU_NotHomeSubnet_A0.seq
-v6eval/ct/mip6-ha-20/BU_NotHomeSubnet_A1.def
-v6eval/ct/mip6-ha-20/BU_NotHomeSubnet_A1.html
-v6eval/ct/mip6-ha-20/BU_NotHomeSubnet_A1.seq
-v6eval/ct/mip6-ha-20/BU_Piggyback.def
-v6eval/ct/mip6-ha-20/BU_Piggyback.html
-v6eval/ct/mip6-ha-20/BU_Piggyback.seq
-v6eval/ct/mip6-ha-20/BU_Piggyback_BCE.def
-v6eval/ct/mip6-ha-20/BU_Piggyback_BCE.html
-v6eval/ct/mip6-ha-20/BU_Piggyback_BCE.seq
-v6eval/ct/mip6-ha-20/BU_SEQ_A1.def
-v6eval/ct/mip6-ha-20/BU_SEQ_A1.html
-v6eval/ct/mip6-ha-20/BU_SEQ_A1.seq
-v6eval/ct/mip6-ha-20/BU_SEQ_EQ_A1.def
-v6eval/ct/mip6-ha-20/BU_SEQ_EQ_A1.html
-v6eval/ct/mip6-ha-20/BU_SEQ_EQ_A1.seq
-v6eval/ct/mip6-ha-20/BU_SEQ_LESS_A1.def
-v6eval/ct/mip6-ha-20/BU_SEQ_LESS_A1.html
-v6eval/ct/mip6-ha-20/BU_SEQ_LESS_A1.seq
-v6eval/ct/mip6-ha-20/BU_SEQ_MAX_A1.def
-v6eval/ct/mip6-ha-20/BU_SEQ_MAX_A1.html
-v6eval/ct/mip6-ha-20/BU_SEQ_MAX_A1.seq
-v6eval/ct/mip6-ha-20/BU_SEQ_MORE_A1.def
-v6eval/ct/mip6-ha-20/BU_SEQ_MORE_A1.html
-v6eval/ct/mip6-ha-20/BU_SEQ_MORE_A1.seq
-v6eval/ct/mip6-ha-20/BU_SEQ_OVERFLOW_A1.def
-v6eval/ct/mip6-ha-20/BU_SEQ_OVERFLOW_A1.html
-v6eval/ct/mip6-ha-20/BU_SEQ_OVERFLOW_A1.seq
-v6eval/ct/mip6-ha-20/BU_SEQ_OVERFLOW_EQ_A1.def
-v6eval/ct/mip6-ha-20/BU_SEQ_OVERFLOW_EQ_A1.html
-v6eval/ct/mip6-ha-20/BU_SEQ_OVERFLOW_EQ_A1.seq
-v6eval/ct/mip6-ha-20/BU_SEQ_OVERFLOW_LESS_A1.def
-v6eval/ct/mip6-ha-20/BU_SEQ_OVERFLOW_LESS_A1.html
-v6eval/ct/mip6-ha-20/BU_SEQ_OVERFLOW_LESS_A1.seq
-v6eval/ct/mip6-ha-20/BU_SEQ_OVERFLOW_MAX_A1.def
-v6eval/ct/mip6-ha-20/BU_SEQ_OVERFLOW_MAX_A1.html
-v6eval/ct/mip6-ha-20/BU_SEQ_OVERFLOW_MAX_A1.seq
-v6eval/ct/mip6-ha-20/BU_SEQ_OVERFLOW_MORE_A1.def
-v6eval/ct/mip6-ha-20/BU_SEQ_OVERFLOW_MORE_A1.html
-v6eval/ct/mip6-ha-20/BU_SEQ_OVERFLOW_MORE_A1.seq
-v6eval/ct/mip6-ha-20/BU_Valid_A0.def
-v6eval/ct/mip6-ha-20/BU_Valid_A0.html
-v6eval/ct/mip6-ha-20/BU_Valid_A0.seq
-v6eval/ct/mip6-ha-20/BU_Valid_A1.def
-v6eval/ct/mip6-ha-20/BU_Valid_A1.html
-v6eval/ct/mip6-ha-20/BU_Valid_A1.seq
-v6eval/ct/mip6-ha-20/DHAAD_Delete.def
-v6eval/ct/mip6-ha-20/DHAAD_Delete.html
-v6eval/ct/mip6-ha-20/DHAAD_Delete.seq
-v6eval/ct/mip6-ha-20/DHAAD_HA1_HA2_NUT.def
-v6eval/ct/mip6-ha-20/DHAAD_HA1_HA2_NUT.html
-v6eval/ct/mip6-ha-20/DHAAD_HA1_HA2_NUT.seq
-v6eval/ct/mip6-ha-20/DHAAD_HA1_NUT_HA2.def
-v6eval/ct/mip6-ha-20/DHAAD_HA1_NUT_HA2.html
-v6eval/ct/mip6-ha-20/DHAAD_HA1_NUT_HA2.seq
-v6eval/ct/mip6-ha-20/DHAAD_HA2_HA1_NUT.def
-v6eval/ct/mip6-ha-20/DHAAD_HA2_HA1_NUT.html
-v6eval/ct/mip6-ha-20/DHAAD_HA2_HA1_NUT.seq
-v6eval/ct/mip6-ha-20/DHAAD_HA2_NUT_HA1.def
-v6eval/ct/mip6-ha-20/DHAAD_HA2_NUT_HA1.html
-v6eval/ct/mip6-ha-20/DHAAD_HA2_NUT_HA1.seq
-v6eval/ct/mip6-ha-20/DHAAD_Highest.def
-v6eval/ct/mip6-ha-20/DHAAD_Highest.html
-v6eval/ct/mip6-ha-20/DHAAD_Highest.seq
-v6eval/ct/mip6-ha-20/DHAAD_Lowest.def
-v6eval/ct/mip6-ha-20/DHAAD_Lowest.html
-v6eval/ct/mip6-ha-20/DHAAD_Lowest.seq
-v6eval/ct/mip6-ha-20/DHAAD_NUT_HA1_HA2.def
-v6eval/ct/mip6-ha-20/DHAAD_NUT_HA1_HA2.html
-v6eval/ct/mip6-ha-20/DHAAD_NUT_HA1_HA2.seq
-v6eval/ct/mip6-ha-20/DHAAD_NUT_HA2_HA1.def
-v6eval/ct/mip6-ha-20/DHAAD_NUT_HA2_HA1.html
-v6eval/ct/mip6-ha-20/DHAAD_NUT_HA2_HA1.seq
-v6eval/ct/mip6-ha-20/DHAAD_Simple.def
-v6eval/ct/mip6-ha-20/DHAAD_Simple.html
-v6eval/ct/mip6-ha-20/DHAAD_Simple.seq
-v6eval/ct/mip6-ha-20/DeReg_LT0_FOREIGN.def
-v6eval/ct/mip6-ha-20/DeReg_LT0_FOREIGN.html
-v6eval/ct/mip6-ha-20/DeReg_LT0_FOREIGN.seq
-v6eval/ct/mip6-ha-20/DeReg_LT0_HOME.def
-v6eval/ct/mip6-ha-20/DeReg_LT0_HOME.html
-v6eval/ct/mip6-ha-20/DeReg_LT0_HOME.seq
-v6eval/ct/mip6-ha-20/DeReg_LT1_HOME.def
-v6eval/ct/mip6-ha-20/DeReg_LT1_HOME.html
-v6eval/ct/mip6-ha-20/DeReg_LT1_HOME.seq
-v6eval/ct/mip6-ha-20/DeReg_NotHA4ThisMN.def
-v6eval/ct/mip6-ha-20/DeReg_NotHA4ThisMN.html
-v6eval/ct/mip6-ha-20/DeReg_NotHA4ThisMN.seq
-v6eval/ct/mip6-ha-20/INDEX
-v6eval/ct/mip6-ha-20/Initialization.def
-v6eval/ct/mip6-ha-20/Initialization.html
-v6eval/ct/mip6-ha-20/Initialization.seq
-v6eval/ct/mip6-ha-20/MIP6.def
-v6eval/ct/mip6-ha-20/MIP6.pm
-v6eval/ct/mip6-ha-20/MPS_Simple.def
-v6eval/ct/mip6-ha-20/MPS_Simple.html
-v6eval/ct/mip6-ha-20/MPS_Simple.seq
-v6eval/ct/mip6-ha-20/Makefile
-v6eval/ct/mip6-ha-20/PingCNtoMN_LL.def
-v6eval/ct/mip6-ha-20/PingCNtoMN_LL.html
-v6eval/ct/mip6-ha-20/PingCNtoMN_LL.seq
-v6eval/ct/mip6-ha-20/PingMNtoHA.def
-v6eval/ct/mip6-ha-20/PingMNtoHA.html
-v6eval/ct/mip6-ha-20/PingMNtoHA.seq
-v6eval/ct/mip6-ha-20/RevTun_Simple.def
-v6eval/ct/mip6-ha-20/RevTun_Simple.html
-v6eval/ct/mip6-ha-20/RevTun_Simple.seq
-v6eval/ct/mip6-ha-20/index.html
-v6eval/ct/mip6-ha-20/kame-freebsd.rtadvd.tmpl
-v6eval/ct/mip6-mn-20/.footer
-v6eval/ct/mip6-mn-20/INDEX_mn
-v6eval/ct/mip6-mn-20/MN_BasicBehavior.html
-v6eval/ct/mip6-mn-20/MN_BasicBehavior.seq
-v6eval/ct/mip6-mn-20/MN_Common.def
-v6eval/ct/mip6-mn-20/MN_Init.html
-v6eval/ct/mip6-mn-20/MN_Init.seq
-v6eval/ct/mip6-mn-20/MN_echo.def
-v6eval/ct/mip6-mn-20/MN_frag.def
-v6eval/ct/mip6-mn-20/MN_macro.def
-v6eval/ct/mip6-mn-20/MN_mh.def
-v6eval/ct/mip6-mn-20/MN_neighbor.def
-v6eval/ct/mip6-mn-20/MN_network.def
-v6eval/ct/mip6-mn-20/MN_other.def
-v6eval/ct/mip6-mn-20/MN_router.def
-v6eval/ct/mip6-mn-20/Makefile
-v6eval/ct/mip6-mn-20/MoveDAD.html
-v6eval/ct/mip6-mn-20/MoveDAD.seq
-v6eval/ct/mip6-mn-20/MoveFreq.html
-v6eval/ct/mip6-mn-20/MoveFreq.seq
-v6eval/ct/mip6-mn-20/MoveFromForeignToForeign.html
-v6eval/ct/mip6-mn-20/MoveFromForeignToForeign.seq
-v6eval/ct/mip6-mn-20/MoveFromHomeToForeign.html
-v6eval/ct/mip6-mn-20/MoveFromHomeToForeign.seq
-v6eval/ct/mip6-mn-20/MoveRobust.html
-v6eval/ct/mip6-mn-20/MoveRobust.seq
-v6eval/ct/mip6-mn-20/ProcessingBRR.html
-v6eval/ct/mip6-mn-20/ProcessingBRR.seq
-v6eval/ct/mip6-mn-20/ReceivingBA132.html
-v6eval/ct/mip6-mn-20/ReceivingBA132.seq
-v6eval/ct/mip6-mn-20/ReceivingPacketWRH.html
-v6eval/ct/mip6-mn-20/ReceivingPacketWRH.seq
-v6eval/ct/mip6-mn-20/ReceivingPacketWRHold.html
-v6eval/ct/mip6-mn-20/ReceivingPacketWRHold.seq
-v6eval/ct/mip6-mn-20/ReceivingPacketWoRH.html
-v6eval/ct/mip6-mn-20/ReceivingPacketWoRH.seq
-v6eval/ct/mip6-mn-20/ReturningHome.html
-v6eval/ct/mip6-mn-20/ReturningHome.seq
-v6eval/ct/mip6-mn-20/SendingBUtoCN.html
-v6eval/ct/mip6-mn-20/SendingBUtoCN.seq
-v6eval/ct/mip6-mn-20/SendingBUtoHA.html
-v6eval/ct/mip6-mn-20/SendingBUtoHA.seq
-v6eval/ct/mip6-mn-20/SendingDHAAD.html
-v6eval/ct/mip6-mn-20/SendingDHAAD.seq
-v6eval/ct/mip6-mn-20/SendingDHAADandRegist.html
-v6eval/ct/mip6-mn-20/SendingDHAADandRegist.seq
-v6eval/ct/mip6-mn-20/SendingMobilePrefixSol.html
-v6eval/ct/mip6-mn-20/SendingMobilePrefixSol.seq
-v6eval/ct/mip6-mn-20/SendingPacketAtForeignLink1.html
-v6eval/ct/mip6-mn-20/SendingPacketAtForeignLink1.seq
-v6eval/ct/mip6-mn-20/SendingPacketAtForeignLink2.html
-v6eval/ct/mip6-mn-20/SendingPacketAtForeignLink2.seq
-v6eval/ct/mip6-mn-20/SendingPacketAtHomeLink.html
-v6eval/ct/mip6-mn-20/SendingPacketAtHomeLink.seq
-v6eval/ct/mip6-mn-20/index.html
-v6eval/ct/mip6-mn-20/mip6MN_common.pm
-v6eval/ct/natpt/.footer
-v6eval/ct/natpt/00README
-v6eval/ct/natpt/INDEX_router
-v6eval/ct/natpt/Makefile
-v6eval/ct/natpt/TODO
-v6eval/ct/natpt/index.html
-v6eval/ct/natpt/init_natpt_in_out.html
-v6eval/ct/natpt/init_natpt_in_out.seq
-v6eval/ct/natpt/init_natpt_out_in.html
-v6eval/ct/natpt/init_natpt_out_in.seq
-v6eval/ct/natpt/init_natpt_out_out.html
-v6eval/ct/natpt/init_natpt_out_out.seq
-v6eval/ct/natpt/initialize.html
-v6eval/ct/natpt/initialize.seq
-v6eval/ct/natpt/initialize_natpt.html
-v6eval/ct/natpt/initialize_natpt.seq
-v6eval/ct/natpt/natpt.def
-v6eval/ct/natpt/natpt.pm
-v6eval/ct/natpt/ping_siit.def
-v6eval/ct/natpt/ping_siit.html
-v6eval/ct/natpt/ping_siit.seq
-v6eval/ct/natpt/ping_siit_frag.def
-v6eval/ct/natpt/ping_siit_frag.html
-v6eval/ct/natpt/ping_siit_frag.seq
-v6eval/ct/natpt/rfc2765_3.1_frag.def
-v6eval/ct/natpt/rfc2765_3.1_frag.html
-v6eval/ct/natpt/rfc2765_3.1_frag.seq
-v6eval/ct/natpt/rfc2765_3.1_fragmentation.def
-v6eval/ct/natpt/rfc2765_3.1_fragmentation.html
-v6eval/ct/natpt/rfc2765_3.1_fragmentation.seq
-v6eval/ct/natpt/rfc2765_3.1_hoplimit.def
-v6eval/ct/natpt/rfc2765_3.1_hoplimit.html
-v6eval/ct/natpt/rfc2765_3.1_hoplimit.seq
-v6eval/ct/natpt/rfc2765_3.1_nextheader.def
-v6eval/ct/natpt/rfc2765_3.1_nextheader.html
-v6eval/ct/natpt/rfc2765_3.1_nextheader.seq
-v6eval/ct/natpt/rfc2765_3.1_nextheaderfrag.def
-v6eval/ct/natpt/rfc2765_3.1_nextheaderfrag.html
-v6eval/ct/natpt/rfc2765_3.1_nextheaderfrag.seq
-v6eval/ct/natpt/rfc2765_3.1_options.def
-v6eval/ct/natpt/rfc2765_3.1_options.html
-v6eval/ct/natpt/rfc2765_3.1_options.seq
-v6eval/ct/natpt/rfc2765_3.1_payloadlength.def
-v6eval/ct/natpt/rfc2765_3.1_payloadlength.html
-v6eval/ct/natpt/rfc2765_3.1_payloadlength.seq
-v6eval/ct/natpt/rfc2765_3.1_sourceroute.def
-v6eval/ct/natpt/rfc2765_3.1_sourceroute.html
-v6eval/ct/natpt/rfc2765_3.1_sourceroute.seq
-v6eval/ct/natpt/rfc2765_3.1_trafficclass.def
-v6eval/ct/natpt/rfc2765_3.1_trafficclass.html
-v6eval/ct/natpt/rfc2765_3.1_trafficclass.seq
-v6eval/ct/natpt/rfc2765_3.2_udp.def
-v6eval/ct/natpt/rfc2765_3.2_udp.html
-v6eval/ct/natpt/rfc2765_3.2_udp.seq
-v6eval/ct/natpt/rfc2765_3.3_icmpv4error.def
-v6eval/ct/natpt/rfc2765_3.3_icmpv4error.html
-v6eval/ct/natpt/rfc2765_3.3_icmpv4error.seq
-v6eval/ct/natpt/rfc2765_3.3_icmpv4query.def
-v6eval/ct/natpt/rfc2765_3.3_icmpv4query.html
-v6eval/ct/natpt/rfc2765_3.3_icmpv4query.seq
-v6eval/ct/natpt/rfc2765_4.1_frag.def
-v6eval/ct/natpt/rfc2765_4.1_frag.html
-v6eval/ct/natpt/rfc2765_4.1_frag.seq
-v6eval/ct/natpt/rfc2765_4.1_hoplimit.def
-v6eval/ct/natpt/rfc2765_4.1_hoplimit.html
-v6eval/ct/natpt/rfc2765_4.1_hoplimit.seq
-v6eval/ct/natpt/rfc2765_4.1_nextheader.def
-v6eval/ct/natpt/rfc2765_4.1_nextheader.html
-v6eval/ct/natpt/rfc2765_4.1_nextheader.seq
-v6eval/ct/natpt/rfc2765_4.1_nextheaderfrag.def
-v6eval/ct/natpt/rfc2765_4.1_nextheaderfrag.html
-v6eval/ct/natpt/rfc2765_4.1_nextheaderfrag.seq
-v6eval/ct/natpt/rfc2765_4.1_options.def
-v6eval/ct/natpt/rfc2765_4.1_options.html
-v6eval/ct/natpt/rfc2765_4.1_options.seq
-v6eval/ct/natpt/rfc2765_4.1_payloadlength.def
-v6eval/ct/natpt/rfc2765_4.1_payloadlength.html
-v6eval/ct/natpt/rfc2765_4.1_payloadlength.seq
-v6eval/ct/natpt/rfc2765_4.1_routingheader.def
-v6eval/ct/natpt/rfc2765_4.1_routingheader.html
-v6eval/ct/natpt/rfc2765_4.1_routingheader.seq
-v6eval/ct/natpt/rfc2765_4.1_trafficclass.def
-v6eval/ct/natpt/rfc2765_4.1_trafficclass.html
-v6eval/ct/natpt/rfc2765_4.1_trafficclass.seq
-v6eval/ct/natpt/rfc2765_4.2_icmpv6error.def
-v6eval/ct/natpt/rfc2765_4.2_icmpv6error.html
-v6eval/ct/natpt/rfc2765_4.2_icmpv6error.seq
-v6eval/ct/natpt/rfc2765_4.2_icmpv6query.def
-v6eval/ct/natpt/rfc2765_4.2_icmpv6query.html
-v6eval/ct/natpt/rfc2765_4.2_icmpv6query.seq
-v6eval/ct/natpt/rfc2766_4.1_dns_v4tov6.def
-v6eval/ct/natpt/rfc2766_4.1_dns_v4tov6.html
-v6eval/ct/natpt/rfc2766_4.1_dns_v4tov6.seq
-v6eval/ct/natpt/rfc2766_5.3.1_checksum_icmp.def
-v6eval/ct/natpt/rfc2766_5.3.1_checksum_icmp.html
-v6eval/ct/natpt/rfc2766_5.3.1_checksum_icmp.seq
-v6eval/ct/natpt/rfc2766_5.3.1_checksum_tcp_udp.def
-v6eval/ct/natpt/rfc2766_5.3.1_checksum_tcp_udp.html
-v6eval/ct/natpt/rfc2766_5.3.1_checksum_tcp_udp.seq
-v6eval/ct/natpt/rfc2766_5.3.2_checksum_icmp.def
-v6eval/ct/natpt/rfc2766_5.3.2_checksum_icmp.html
-v6eval/ct/natpt/rfc2766_5.3.2_checksum_icmp.seq
-v6eval/ct/natpt/rfc2766_5.3.2_checksum_tcp_udp.def
-v6eval/ct/natpt/rfc2766_5.3.2_checksum_tcp_udp.html
-v6eval/ct/natpt/rfc2766_5.3.2_checksum_tcp_udp.seq
-v6eval/ct/natpt/rfc2766_ping.def
-v6eval/ct/natpt/rfc2766_ping.html
-v6eval/ct/natpt/rfc2766_ping.seq
-v6eval/ct/nd/.footer
-v6eval/ct/nd/00README
-v6eval/ct/nd/INDEX-d1.nd
-v6eval/ct/nd/INDEX-d1.rd
-v6eval/ct/nd/INDEX-d1.redirect
-v6eval/ct/nd/INDEX-d2.nd
-v6eval/ct/nd/INDEX-d2.rd
-v6eval/ct/nd/INDEX-d2.redirect
-v6eval/ct/nd/INDEX-d3.nd
-v6eval/ct/nd/INDEX-d3.rd
-v6eval/ct/nd/INDEX-d3.redirect
-v6eval/ct/nd/INDEX-ume.nd
-v6eval/ct/nd/INDEX-ume.rd
-v6eval/ct/nd/INDEX-ume.start
-v6eval/ct/nd/INDEX-ume_router.nd
-v6eval/ct/nd/INDEX-ume_router.rd
-v6eval/ct/nd/INDEX-ume_router.redirect
-v6eval/ct/nd/INDEX.end
-v6eval/ct/nd/INDEX.nd
-v6eval/ct/nd/INDEX.rd
-v6eval/ct/nd/INDEX.redirect
-v6eval/ct/nd/INDEX.start
-v6eval/ct/nd/Makefile
-v6eval/ct/nd/adrsolvQueuMulti.def
-v6eval/ct/nd/adrsolvQueuMulti.html
-v6eval/ct/nd/adrsolvQueuMulti.seq
-v6eval/ct/nd/adrsolvQueuOne.def
-v6eval/ct/nd/adrsolvQueuOne.html
-v6eval/ct/nd/adrsolvQueuOne.seq
-v6eval/ct/nd/adrsolvQueuTwo.def
-v6eval/ct/nd/adrsolvQueuTwo.html
-v6eval/ct/nd/adrsolvQueuTwo.seq
-v6eval/ct/nd/cisco-ios.rtadvd.tmpl
-v6eval/ct/nd/freebsd-i386.rtadvd.tmpl
-v6eval/ct/nd/freebsd43-i386.rtadvd.tmpl
-v6eval/ct/nd/hitachi-nr60.rtadvd.tmpl
-v6eval/ct/nd/hostRecvRaAFlag.def
-v6eval/ct/nd/hostRecvRaInvalid.def
-v6eval/ct/nd/hostRecvRaInvalid.html
-v6eval/ct/nd/hostRecvRaInvalid.seq
-v6eval/ct/nd/hostRecvRaLFlag.def
-v6eval/ct/nd/hostRecvRaNHD.def
-v6eval/ct/nd/hostRecvRaNHD.html
-v6eval/ct/nd/hostRecvRaNHD.seq
-v6eval/ct/nd/hostRecvRaPrefix.def
-v6eval/ct/nd/hostRecvRaPrefix.seq
-v6eval/ct/nd/hostRecvRaRFlag.def
-v6eval/ct/nd/hostRecvRaRFlag.html
-v6eval/ct/nd/hostRecvRaRFlag.seq
-v6eval/ct/nd/hostRecvRaRLifetime0.def
-v6eval/ct/nd/hostRecvRaRLifetime0.html
-v6eval/ct/nd/hostRecvRaRLifetime0.seq
-v6eval/ct/nd/hostRecvRaRLifetimeN.def
-v6eval/ct/nd/hostRecvRaRLifetimeN.html
-v6eval/ct/nd/hostRecvRaRLifetimeN.seq
-v6eval/ct/nd/hostRecvRaReachableTime.def
-v6eval/ct/nd/hostRecvRaReachableTime.html
-v6eval/ct/nd/hostRecvRaReachableTime.seq
-v6eval/ct/nd/hostRecvRaURD.def
-v6eval/ct/nd/hostRecvRaURD.html
-v6eval/ct/nd/hostRecvRaURD.seq
-v6eval/ct/nd/hostRecvRas.def
-v6eval/ct/nd/hostRecvRas.html
-v6eval/ct/nd/hostRecvRas.seq
-v6eval/ct/nd/hostRecvRas2.def
-v6eval/ct/nd/hostRecvRas2.html
-v6eval/ct/nd/hostRecvRas2.seq
-v6eval/ct/nd/hostRecvRedirect4Nonce.def
-v6eval/ct/nd/hostRecvRedirect4Nonce.html
-v6eval/ct/nd/hostRecvRedirect4Nonce.seq
-v6eval/ct/nd/hostRecvRedirect4OfflinkDC.def
-v6eval/ct/nd/hostRecvRedirect4OfflinkDC.html
-v6eval/ct/nd/hostRecvRedirect4OfflinkDC.seq
-v6eval/ct/nd/hostRecvRedirect4OfflinkNUD.def
-v6eval/ct/nd/hostRecvRedirect4OfflinkNUD.html
-v6eval/ct/nd/hostRecvRedirect4OfflinkNUD.seq
-v6eval/ct/nd/hostRecvRedirect4OnlinkDC.def
-v6eval/ct/nd/hostRecvRedirect4OnlinkDC.html
-v6eval/ct/nd/hostRecvRedirect4OnlinkDC.seq
-v6eval/ct/nd/hostRecvRedirect4OnlinkNUD.def
-v6eval/ct/nd/hostRecvRedirect4OnlinkNUD.html
-v6eval/ct/nd/hostRecvRedirect4OnlinkNUD.seq
-v6eval/ct/nd/hostRecvRedirect4RFlag.def
-v6eval/ct/nd/hostRecvRedirect4RFlag.html
-v6eval/ct/nd/hostRecvRedirect4RFlag.seq
-v6eval/ct/nd/hostRecvRedirect4RFlag2.def
-v6eval/ct/nd/hostRecvRedirect4RFlag2.html
-v6eval/ct/nd/hostRecvRedirect4RFlag2.seq
-v6eval/ct/nd/hostRecvRedirect4RouterLifetime0.def
-v6eval/ct/nd/hostRecvRedirect4RouterLifetime0.html
-v6eval/ct/nd/hostRecvRedirect4RouterLifetime0.seq
-v6eval/ct/nd/hostRecvRedirect4RouterLifetime02.def
-v6eval/ct/nd/hostRecvRedirect4RouterLifetime02.html
-v6eval/ct/nd/hostRecvRedirect4RouterLifetime02.seq
-v6eval/ct/nd/hostRecvRedirectInvalid.def
-v6eval/ct/nd/hostRecvRedirectInvalid.html
-v6eval/ct/nd/hostRecvRedirectInvalid.seq
-v6eval/ct/nd/hostRecvRs.def
-v6eval/ct/nd/hostRecvRs.html
-v6eval/ct/nd/hostRecvRs.seq
-v6eval/ct/nd/hostRedirect.def
-v6eval/ct/nd/hostRedirect.pm
-v6eval/ct/nd/hostRs.def
-v6eval/ct/nd/hostSendRs.def
-v6eval/ct/nd/hostSendRs.html
-v6eval/ct/nd/hostSendRs.seq
-v6eval/ct/nd/hostSendRsAfterSolicitedRa.def
-v6eval/ct/nd/hostSendRsAfterSolicitedRa.html
-v6eval/ct/nd/hostSendRsAfterSolicitedRa.seq
-v6eval/ct/nd/hostSendRsAfterUnsolicitedRa.def
-v6eval/ct/nd/hostSendRsAfterUnsolicitedRa.html
-v6eval/ct/nd/hostSendRsAfterUnsolicitedRa.seq
-v6eval/ct/nd/iij-seil.rtadvd.tmpl
-v6eval/ct/nd/index.html
-v6eval/ct/nd/kame-freebsd.rtadvd.tmpl
-v6eval/ct/nd/kame-netbsd-i386.rtadvd.tmpl
-v6eval/ct/nd/linux-v6.rtadvd.tmpl
-v6eval/ct/nd/mgcs-sj6.rtadvd.tmpl
-v6eval/ct/nd/ncStateByNa.def
-v6eval/ct/nd/ncStateByNa4Incomplete.def
-v6eval/ct/nd/ncStateByNa4Incomplete.html
-v6eval/ct/nd/ncStateByNa4Incomplete.seq
-v6eval/ct/nd/ncStateByNa4Nonce.def
-v6eval/ct/nd/ncStateByNa4Nonce.html
-v6eval/ct/nd/ncStateByNa4Nonce.seq
-v6eval/ct/nd/ncStateByNa4Probe.def
-v6eval/ct/nd/ncStateByNa4Probe.html
-v6eval/ct/nd/ncStateByNa4Probe.seq
-v6eval/ct/nd/ncStateByNa4Reachable.def
-v6eval/ct/nd/ncStateByNa4Reachable.html
-v6eval/ct/nd/ncStateByNa4Reachable.seq
-v6eval/ct/nd/ncStateByNa4Stale.def
-v6eval/ct/nd/ncStateByNa4Stale.html
-v6eval/ct/nd/ncStateByNa4Stale.seq
-v6eval/ct/nd/ncStateByNs.def
-v6eval/ct/nd/ncStateByNs4Incomplete.def
-v6eval/ct/nd/ncStateByNs4Incomplete.html
-v6eval/ct/nd/ncStateByNs4Incomplete.seq
-v6eval/ct/nd/ncStateByNs4NoNce.def
-v6eval/ct/nd/ncStateByNs4NoNce.html
-v6eval/ct/nd/ncStateByNs4NoNce.seq
-v6eval/ct/nd/ncStateByNs4Probe.def
-v6eval/ct/nd/ncStateByNs4Probe.html
-v6eval/ct/nd/ncStateByNs4Probe.seq
-v6eval/ct/nd/ncStateByNs4Reachable.def
-v6eval/ct/nd/ncStateByNs4Reachable.html
-v6eval/ct/nd/ncStateByNs4Reachable.seq
-v6eval/ct/nd/ncStateByNs4Stale.def
-v6eval/ct/nd/ncStateByNs4Stale.html
-v6eval/ct/nd/ncStateByNs4Stale.seq
-v6eval/ct/nd/ncStateByRa.def
-v6eval/ct/nd/ncStateByRa4Incomplete.def
-v6eval/ct/nd/ncStateByRa4Incomplete.html
-v6eval/ct/nd/ncStateByRa4Incomplete.seq
-v6eval/ct/nd/ncStateByRa4Nonce.def
-v6eval/ct/nd/ncStateByRa4Nonce.html
-v6eval/ct/nd/ncStateByRa4Nonce.seq
-v6eval/ct/nd/ncStateByRa4Probe.def
-v6eval/ct/nd/ncStateByRa4Probe.html
-v6eval/ct/nd/ncStateByRa4Probe.seq
-v6eval/ct/nd/ncStateByRa4Reachable.def
-v6eval/ct/nd/ncStateByRa4Reachable.html
-v6eval/ct/nd/ncStateByRa4Reachable.seq
-v6eval/ct/nd/ncStateByRa4Stale.def
-v6eval/ct/nd/ncStateByRa4Stale.html
-v6eval/ct/nd/ncStateByRa4Stale.seq
-v6eval/ct/nd/ncStateByRedirect4Incomplete.def
-v6eval/ct/nd/ncStateByRedirect4Incomplete.html
-v6eval/ct/nd/ncStateByRedirect4Incomplete.seq
-v6eval/ct/nd/ncStateByRedirect4Nonce.def
-v6eval/ct/nd/ncStateByRedirect4Nonce.html
-v6eval/ct/nd/ncStateByRedirect4Nonce.seq
-v6eval/ct/nd/ncStateByRedirect4Probe.def
-v6eval/ct/nd/ncStateByRedirect4Probe.html
-v6eval/ct/nd/ncStateByRedirect4Probe.seq
-v6eval/ct/nd/ncStateByRedirect4Reachable.def
-v6eval/ct/nd/ncStateByRedirect4Reachable.html
-v6eval/ct/nd/ncStateByRedirect4Reachable.seq
-v6eval/ct/nd/ncStateByRedirect4Stale.def
-v6eval/ct/nd/ncStateByRedirect4Stale.html
-v6eval/ct/nd/ncStateByRedirect4Stale.seq
-v6eval/ct/nd/ncStateByRs.def
-v6eval/ct/nd/ncStateByRs4Incomplete.def
-v6eval/ct/nd/ncStateByRs4Incomplete.html
-v6eval/ct/nd/ncStateByRs4Incomplete.seq
-v6eval/ct/nd/ncStateByRs4NoNce.def
-v6eval/ct/nd/ncStateByRs4NoNce.html
-v6eval/ct/nd/ncStateByRs4NoNce.seq
-v6eval/ct/nd/ncStateByRs4Probe.def
-v6eval/ct/nd/ncStateByRs4Probe.html
-v6eval/ct/nd/ncStateByRs4Probe.seq
-v6eval/ct/nd/ncStateByRs4Reachable.def
-v6eval/ct/nd/ncStateByRs4Reachable.html
-v6eval/ct/nd/ncStateByRs4Reachable.seq
-v6eval/ct/nd/ncStateByRs4Stale.def
-v6eval/ct/nd/ncStateByRs4Stale.html
-v6eval/ct/nd/ncStateByRs4Stale.seq
-v6eval/ct/nd/nd.def
-v6eval/ct/nd/nd.html
-v6eval/ct/nd/nd.pm
-v6eval/ct/nd/nec-libra.rtadvd.tmpl
-v6eval/ct/nd/nec-mip6.rtadvd.tmpl
-v6eval/ct/nd/netbsd-i386.rtadvd.tmpl
-v6eval/ct/nd/openbsd-i386.rtadvd.tmpl
-v6eval/ct/nd/ra.def
-v6eval/ct/nd/ra.pm
-v6eval/ct/nd/recvNaRFlag.def
-v6eval/ct/nd/recvNaRFlag.html
-v6eval/ct/nd/recvNaRFlag.seq
-v6eval/ct/nd/recvNsBasic.def
-v6eval/ct/nd/recvNsBasic.html
-v6eval/ct/nd/recvNsBasic.seq
-v6eval/ct/nd/recvNsInvalid.def
-v6eval/ct/nd/recvNsInvalid.html
-v6eval/ct/nd/recvNsInvalid.seq
-v6eval/ct/nd/recvNsRFlag.def
-v6eval/ct/nd/recvNsRFlag.html
-v6eval/ct/nd/recvNsRFlag.seq
-v6eval/ct/nd/reset.html
-v6eval/ct/nd/reset.seq
-v6eval/ct/nd/routerRecvRa.def
-v6eval/ct/nd/routerRecvRa.html
-v6eval/ct/nd/routerRecvRa.seq
-v6eval/ct/nd/routerRecvRedirect.def
-v6eval/ct/nd/routerRecvRedirect.seq
-v6eval/ct/nd/routerRecvRs.def
-v6eval/ct/nd/routerRecvRs.html
-v6eval/ct/nd/routerRecvRs.seq
-v6eval/ct/nd/routerRecvRsInvalid.def
-v6eval/ct/nd/routerRecvRsInvalid.html
-v6eval/ct/nd/routerRecvRsInvalid.seq
-v6eval/ct/nd/routerRedirect.def
-v6eval/ct/nd/routerRedirect.pm
-v6eval/ct/nd/routerSendRedirectOfflink.def
-v6eval/ct/nd/routerSendRedirectOfflink.html
-v6eval/ct/nd/routerSendRedirectOfflink.seq
-v6eval/ct/nd/routerSendRedirectOfflink2.def
-v6eval/ct/nd/routerSendRedirectOfflink2.html
-v6eval/ct/nd/routerSendRedirectOfflink2.seq
-v6eval/ct/nd/routerSendRedirectOnlink.def
-v6eval/ct/nd/routerSendRedirectOnlink.html
-v6eval/ct/nd/routerSendRedirectOnlink.seq
-v6eval/ct/nd/routerSendSolRaDefault.def
-v6eval/ct/nd/routerSendSolRaDefault.html
-v6eval/ct/nd/routerSendSolRaDefault.seq
-v6eval/ct/nd/routerSendUnsolRaDefault.def
-v6eval/ct/nd/routerSendUnsolRaDefault.html
-v6eval/ct/nd/routerSendUnsolRaDefault.seq
-v6eval/ct/nd/routerSendUnsolRaDefault2.def
-v6eval/ct/nd/routerSendUnsolRaDefault2.html
-v6eval/ct/nd/routerSendUnsolRaDefault2.seq
-v6eval/ct/nd/routerSendUnsolRaMax.def
-v6eval/ct/nd/routerSendUnsolRaMax.html
-v6eval/ct/nd/routerSendUnsolRaMax.seq
-v6eval/ct/nd/routerSendUnsolRaMin.def
-v6eval/ct/nd/routerSendUnsolRaMin.html
-v6eval/ct/nd/routerSendUnsolRaMin.seq
-v6eval/ct/nd/sendMcastNS.def
-v6eval/ct/nd/sendMcastNS.html
-v6eval/ct/nd/sendMcastNS.seq
-v6eval/ct/nd/sendMcastNS2.def
-v6eval/ct/nd/sendMcastNS2.html
-v6eval/ct/nd/sendMcastNS2.seq
-v6eval/ct/nd/sendNsBasicGlobGlob.def
-v6eval/ct/nd/sendNsBasicGlobGlob.html
-v6eval/ct/nd/sendNsBasicGlobGlob.seq
-v6eval/ct/nd/sendNsBasicGlobLink.def
-v6eval/ct/nd/sendNsBasicGlobLink.html
-v6eval/ct/nd/sendNsBasicGlobLink.seq
-v6eval/ct/nd/sendNsBasicLinkGlob.def
-v6eval/ct/nd/sendNsBasicLinkGlob.html
-v6eval/ct/nd/sendNsBasicLinkGlob.seq
-v6eval/ct/nd/sendNsBasicLocal.def
-v6eval/ct/nd/sendNsBasicLocal.html
-v6eval/ct/nd/sendNsBasicLocal.seq
-v6eval/ct/nd/sendUcastNS.def
-v6eval/ct/nd/sendUcastNS.html
-v6eval/ct/nd/sendUcastNS.seq
-v6eval/ct/nd/sendUcastNS2.def
-v6eval/ct/nd/sendUcastNS2.html
-v6eval/ct/nd/sendUcastNS2.seq
-v6eval/ct/nd/sfc-mip6.rtadvd.tmpl
-v6eval/ct/nd/startDefaultRA.html
-v6eval/ct/nd/startDefaultRA.seq
-v6eval/ct/nd/startRedirect.def
-v6eval/ct/nd/startRedirect.html
-v6eval/ct/nd/startRedirect.seq
-v6eval/ct/nd/startRedirect2.def
-v6eval/ct/nd/startRedirect2.html
-v6eval/ct/nd/startRedirect2.seq
-v6eval/ct/nd/stopRA.html
-v6eval/ct/nd/stopRA.seq
-v6eval/ct/nd/stopRedirect.html
-v6eval/ct/nd/stopRedirect.seq
-v6eval/ct/nd/stopRedirect2.html
-v6eval/ct/nd/stopRedirect2.seq
-v6eval/ct/nd/usagi-i386.rtadvd.tmpl
-v6eval/ct/pd/.footer
-v6eval/ct/pd/00README
-v6eval/ct/pd/BEGIN.def
-v6eval/ct/pd/BEGIN.html
-v6eval/ct/pd/BEGIN.seq
-v6eval/ct/pd/INDEX_begin
-v6eval/ct/pd/INDEX_pd
-v6eval/ct/pd/INDEX_pd_auth
-v6eval/ct/pd/Makefile
-v6eval/ct/pd/RRAdvertisedPreference.def
-v6eval/ct/pd/RRAdvertisedPreference.html
-v6eval/ct/pd/RRAdvertisedPreference.seq
-v6eval/ct/pd/RRAdvertisedStatusCode.def
-v6eval/ct/pd/RRAdvertisedStatusCode.html
-v6eval/ct/pd/RRAdvertisedStatusCode.seq
-v6eval/ct/pd/RRDelayedAuthProto.def
-v6eval/ct/pd/RRDelayedAuthProto.seq
-v6eval/ct/pd/RRRebind.def
-v6eval/ct/pd/RRRebind.html
-v6eval/ct/pd/RRRebind.seq
-v6eval/ct/pd/RRRebindIgnored.def
-v6eval/ct/pd/RRRebindIgnored.seq
-v6eval/ct/pd/RRRebindInvalid.def
-v6eval/ct/pd/RRRebindInvalid.seq
-v6eval/ct/pd/RRRebindPhysical.def
-v6eval/ct/pd/RRRebindPhysical.seq
-v6eval/ct/pd/RRRebindStatusCode.def
-v6eval/ct/pd/RRRebindStatusCode.seq
-v6eval/ct/pd/RRRecfgKeyAuthProto.def
-v6eval/ct/pd/RRRecfgKeyAuthProto.seq
-v6eval/ct/pd/RRRelease.def
-v6eval/ct/pd/RRRelease.html
-v6eval/ct/pd/RRRelease.seq
-v6eval/ct/pd/RRReleaseRetransmit.def
-v6eval/ct/pd/RRReleaseRetransmit.html
-v6eval/ct/pd/RRReleaseRetransmit.seq
-v6eval/ct/pd/RRReleaseRetransmitMRC.def
-v6eval/ct/pd/RRReleaseRetransmitMRC.html
-v6eval/ct/pd/RRReleaseRetransmitMRC.seq
-v6eval/ct/pd/RRRenew.def
-v6eval/ct/pd/RRRenew.html
-v6eval/ct/pd/RRRenew.seq
-v6eval/ct/pd/RRRenewRebind.def
-v6eval/ct/pd/RRRenewRebind.html
-v6eval/ct/pd/RRRenewRebind.seq
-v6eval/ct/pd/RRRepliedServerUnicast.def
-v6eval/ct/pd/RRRepliedServerUnicast.seq
-v6eval/ct/pd/RRRepliedStatusCode.def
-v6eval/ct/pd/RRRepliedStatusCode.html
-v6eval/ct/pd/RRRepliedStatusCode.seq
-v6eval/ct/pd/RRRequest.def
-v6eval/ct/pd/RRRequest.html
-v6eval/ct/pd/RRRequest.seq
-v6eval/ct/pd/RRSolicit.def
-v6eval/ct/pd/RRSolicit.html
-v6eval/ct/pd/RRSolicit.seq
-v6eval/ct/pd/RRSolicitRapid.def
-v6eval/ct/pd/RRSolicitRapid.html
-v6eval/ct/pd/RRSolicitRapid.seq
-v6eval/ct/pd/index.html
-v6eval/ct/pd/kame-freebsd.dhcp6c.tmpl
-v6eval/ct/pd/kame-freebsd.dhcp6c.troan.tmpl
-v6eval/ct/pd/kame-freebsd.rtadvd.tmpl
-v6eval/ct/pd/pd.html
-v6eval/ct/pd/pd.pm
-v6eval/ct/pd/pd_common.def
-v6eval/ct/pd/retrans_mech
-v6eval/ct/pd/type.def
-v6eval/ct/pmtu/.footer
-v6eval/ct/pmtu/00README
-v6eval/ct/pmtu/BEGIN.seq
-v6eval/ct/pmtu/INDEX
-v6eval/ct/pmtu/INDEX_LCNA
-v6eval/ct/pmtu/INDEX_ORG
-v6eval/ct/pmtu/LCNA_RAwMTUopt.def
-v6eval/ct/pmtu/LCNA_RAwMTUopt.seq
-v6eval/ct/pmtu/LCNA_Reassemble.def
-v6eval/ct/pmtu/LCNA_Reassemble.seq
-v6eval/ct/pmtu/LCNA_TBM_gtMinMTU.def
-v6eval/ct/pmtu/LCNA_TBM_gtMinMTU.seq
-v6eval/ct/pmtu/LCNA_TBM_ltMinMTU.def
-v6eval/ct/pmtu/LCNA_TBM_ltMinMTU.seq
-v6eval/ct/pmtu/Makefile
-v6eval/ct/pmtu/MultiPMTU.def
-v6eval/ct/pmtu/MultiPMTU.html
-v6eval/ct/pmtu/MultiPMTU.seq
-v6eval/ct/pmtu/PMTU.def
-v6eval/ct/pmtu/PMTU.pm
-v6eval/ct/pmtu/PMTU_ORG.def
-v6eval/ct/pmtu/PMTU_ORG.pm
-v6eval/ct/pmtu/PMTU_reset.def
-v6eval/ct/pmtu/PMTU_reset.html
-v6eval/ct/pmtu/PMTU_reset.seq
-v6eval/ct/pmtu/PMTUaddress.def
-v6eval/ct/pmtu/PMTUaddress2.def
-v6eval/ct/pmtu/TBM.def
-v6eval/ct/pmtu/TBM.html
-v6eval/ct/pmtu/TBM.seq
-v6eval/ct/pmtu/TBM_onlink.def
-v6eval/ct/pmtu/TBM_onlink.html
-v6eval/ct/pmtu/TBM_onlink.seq
-v6eval/ct/pmtu/acceptRAwithMTUOption.def
-v6eval/ct/pmtu/acceptRAwithMTUOption.seq
-v6eval/ct/pmtu/acceptTooBigMesg.def
-v6eval/ct/pmtu/acceptTooBigMesg.seq
-v6eval/ct/pmtu/checkPMTUincrease.def
-v6eval/ct/pmtu/checkPMTUincrease.seq
-v6eval/ct/pmtu/confirmPing.def
-v6eval/ct/pmtu/confirmPing.html
-v6eval/ct/pmtu/confirmPing.seq
-v6eval/ct/pmtu/index.html
-v6eval/ct/pmtu/initPMTU.def
-v6eval/ct/pmtu/initPMTU.seq
-v6eval/ct/pmtu/pingwRH.def
-v6eval/ct/pmtu/pingwRH.seq
-v6eval/ct/pmtu/setMTU1500.def
-v6eval/ct/pmtu/setMTU1500.seq
-v6eval/ct/pmtu/setMTUwithRA.def
-v6eval/ct/pmtu/setMTUwithRA.html
-v6eval/ct/pmtu/setMTUwithRA.seq
-v6eval/ct/robust/.footer
-v6eval/ct/robust/FH_Overlap_UDP.def
-v6eval/ct/robust/FH_Overlap_UDP.html
-v6eval/ct/robust/FH_Overlap_UDP.seq
-v6eval/ct/robust/FloodPing.html
-v6eval/ct/robust/FloodPing.seq
-v6eval/ct/robust/FromManyNodes.html
-v6eval/ct/robust/FromManyNodes.seq
-v6eval/ct/robust/INDEX
-v6eval/ct/robust/Init.html
-v6eval/ct/robust/Init.seq
-v6eval/ct/robust/Makefile
-v6eval/ct/robust/index.html
-v6eval/ct/robust/ping.def
-v6eval/ct/router-select/.footer
-v6eval/ct/router-select/DAD_LCNA.pm
-v6eval/ct/router-select/DR_1RT.html
-v6eval/ct/router-select/DR_1RT.seq
-v6eval/ct/router-select/DR_2RT_Diff.seq
-v6eval/ct/router-select/DR_2RT_raMED_raHIGHwRTRLIFE0wrtinfoHIGH.seq
-v6eval/ct/router-select/DR_2RT_raMED_raHIGHwRTRLIFE0wrtinfoLIFE0.seq
-v6eval/ct/router-select/Def_HIGH_LOW.html
-v6eval/ct/router-select/Def_HIGH_LOW.seq
-v6eval/ct/router-select/Def_HIGH_LOW_UNREACH.html
-v6eval/ct/router-select/Def_HIGH_LOW_UNREACH.seq
-v6eval/ct/router-select/Def_HIGH_MED.html
-v6eval/ct/router-select/Def_HIGH_MED.seq
-v6eval/ct/router-select/Def_HIGH_UNSPEC.html
-v6eval/ct/router-select/Def_HIGH_UNSPEC.seq
-v6eval/ct/router-select/Def_LOW_HIGH_RTRLIFE_EXPIRE.html
-v6eval/ct/router-select/Def_LOW_HIGH_RTRLIFE_EXPIRE.seq
-v6eval/ct/router-select/Def_LOW_HIGHwRTRLIFE0.html
-v6eval/ct/router-select/Def_LOW_HIGHwRTRLIFE0.seq
-v6eval/ct/router-select/Def_LOW_UNSPEC.html
-v6eval/ct/router-select/Def_LOW_UNSPEC.seq
-v6eval/ct/router-select/Def_MED_LOW.html
-v6eval/ct/router-select/Def_MED_LOW.seq
-v6eval/ct/router-select/Def_MED_MED.html
-v6eval/ct/router-select/Def_MED_MED.seq
-v6eval/ct/router-select/Def_MED_UNSPEC.html
-v6eval/ct/router-select/Def_MED_UNSPEC.seq
-v6eval/ct/router-select/DiffPX_HIGH.html
-v6eval/ct/router-select/DiffPX_HIGH.seq
-v6eval/ct/router-select/DiffPX_LOW.html
-v6eval/ct/router-select/DiffPX_LOW.seq
-v6eval/ct/router-select/DiffPX_MED.html
-v6eval/ct/router-select/DiffPX_MED.seq
-v6eval/ct/router-select/DiffPX_UNSPEC.seq
-v6eval/ct/router-select/INDEX_DEF
-v6eval/ct/router-select/INDEX_HOST
-v6eval/ct/router-select/INDEX_HOST.ORG
-v6eval/ct/router-select/INDEX_INTAP
-v6eval/ct/router-select/LLA_LCNA.def
-v6eval/ct/router-select/Makefile
-v6eval/ct/router-select/RA_LCNA.def
-v6eval/ct/router-select/ROUTE.def
-v6eval/ct/router-select/ROUTE.pm
-v6eval/ct/router-select/RTINFO.def
-v6eval/ct/router-select/SamePX_HIGH_LOW.html
-v6eval/ct/router-select/SamePX_HIGH_LOW.seq
-v6eval/ct/router-select/SamePX_HIGH_MED.html
-v6eval/ct/router-select/SamePX_HIGH_MED.seq
-v6eval/ct/router-select/SamePX_MED_LOW.html
-v6eval/ct/router-select/SamePX_MED_LOW.seq
-v6eval/ct/router-select/SamePX_UNSPEC_HIGH.html
-v6eval/ct/router-select/SamePX_UNSPEC_HIGH.seq
-v6eval/ct/router-select/SamePX_UNSPEC_LOW.html
-v6eval/ct/router-select/SamePX_UNSPEC_LOW.seq
-v6eval/ct/router-select/SamePX_UNSPEC_MED.html
-v6eval/ct/router-select/SamePX_UNSPEC_MED.seq
-v6eval/ct/router-select/index.html
-v6eval/ct/router-select/raHIGH_rtinfoHIGH.html
-v6eval/ct/router-select/raHIGH_rtinfoHIGH.seq
-v6eval/ct/router-select/raHIGH_rtinfoHIGH_DEFAULT.html
-v6eval/ct/router-select/raHIGH_rtinfoHIGH_DEFAULT.seq
-v6eval/ct/router-select/raHIGH_rtinfoLOW.html
-v6eval/ct/router-select/raHIGH_rtinfoLOW.seq
-v6eval/ct/router-select/raHIGH_rtinfoLOW_DEFAULT.html
-v6eval/ct/router-select/raHIGH_rtinfoLOW_DEFAULT.seq
-v6eval/ct/router-select/raHIGH_rtinfoMED.html
-v6eval/ct/router-select/raHIGH_rtinfoMED.seq
-v6eval/ct/router-select/raHIGH_rtinfoMED_DEFAULT.html
-v6eval/ct/router-select/raHIGH_rtinfoMED_DEFAULT.seq
-v6eval/ct/router-select/raLOW_rtinfoLIFE0.html
-v6eval/ct/router-select/raLOW_rtinfoLIFE0.seq
-v6eval/ct/router-select/raLOW_rtinfoLIFE0_DEFAULT.html
-v6eval/ct/router-select/raLOW_rtinfoLIFE0_DEFAULT.seq
-v6eval/ct/router-select/raMED_raHIGHrtinfoUNSPEC_DEFAULT.html
-v6eval/ct/router-select/raMED_raHIGHrtinfoUNSPEC_DEFAULT.seq
-v6eval/ct/router-select/raMED_raLOWrtinfoUNSPEC_DEFAULT.html
-v6eval/ct/router-select/raMED_raLOWrtinfoUNSPEC_DEFAULT.seq
-v6eval/ct/router-select/raMED_rtinfoHIGH_DEFAULT.html
-v6eval/ct/router-select/raMED_rtinfoHIGH_DEFAULT.seq
-v6eval/ct/router-select/raMED_rtinfoLOW_DEFAULT.html
-v6eval/ct/router-select/raMED_rtinfoLOW_DEFAULT.seq
-v6eval/ct/router-select/raMED_rtinfoUNSPEC.html
-v6eval/ct/router-select/raMED_rtinfoUNSPEC.seq
-v6eval/ct/router-select/rtinfo_16.html
-v6eval/ct/router-select/rtinfo_16.seq
-v6eval/ct/router-select/rtinfo_2.html
-v6eval/ct/router-select/rtinfo_2.seq
-v6eval/ct/router-select/rtinfo_64_48.html
-v6eval/ct/router-select/rtinfo_64_48.seq
-v6eval/ct/router-select/rtinfo_64_96.html
-v6eval/ct/router-select/rtinfo_64_96.seq
-v6eval/ct/router-select/rtinfo_64_HIGH48.html
-v6eval/ct/router-select/rtinfo_64_HIGH48.seq
-v6eval/ct/router-select/rtinfo_64_LOW96.html
-v6eval/ct/router-select/rtinfo_64_LOW96.seq
-v6eval/ct/router-select/rtinfo_LOW_HIGH_RTLIFE_EXPIRE.html
-v6eval/ct/router-select/rtinfo_LOW_HIGH_RTLIFE_EXPIRE.seq
-v6eval/ct/router-select/rtinfo_LOW_HIGH_UNREACH.html
-v6eval/ct/router-select/rtinfo_LOW_HIGH_UNREACH.seq
-v6eval/ct/router-select/rtinfo_PXLEN48_Len1.seq
-v6eval/ct/router-select/rtinfo_PXLEN96_Len2.seq
-v6eval/ct/router-select/rtinfo_RTRLIFE_gt_RTLIFE.html
-v6eval/ct/router-select/rtinfo_RTRLIFE_gt_RTLIFE.seq
-v6eval/ct/router-select/rtinfo_RTRLIFE_lt_RTLIFE.html
-v6eval/ct/router-select/rtinfo_RTRLIFE_lt_RTLIFE.seq
-v6eval/ct/spec/.footer
-v6eval/ct/spec/00README
-v6eval/ct/spec/BEGIN.html
-v6eval/ct/spec/BEGIN.seq
-v6eval/ct/spec/DH.def
-v6eval/ct/spec/DH_BadHdrExtLen.def
-v6eval/ct/spec/DH_BadHdrExtLen.html
-v6eval/ct/spec/DH_BadHdrExtLen.seq
-v6eval/ct/spec/DH_BadOptDataLen.def
-v6eval/ct/spec/DH_BadOptDataLen.html
-v6eval/ct/spec/DH_BadOptDataLen.seq
-v6eval/ct/spec/DH_Flood.def
-v6eval/ct/spec/DH_Flood.html
-v6eval/ct/spec/DH_Flood.seq
-v6eval/ct/spec/DH_Pad1.def
-v6eval/ct/spec/DH_Pad1.html
-v6eval/ct/spec/DH_Pad1.seq
-v6eval/ct/spec/DH_PadFlood.def
-v6eval/ct/spec/DH_PadFlood.html
-v6eval/ct/spec/DH_PadFlood.seq
-v6eval/ct/spec/DH_PadN.def
-v6eval/ct/spec/DH_PadN.html
-v6eval/ct/spec/DH_PadN.seq
-v6eval/ct/spec/DH_Type00.def
-v6eval/ct/spec/DH_Type00.html
-v6eval/ct/spec/DH_Type00.seq
-v6eval/ct/spec/DH_Type01.def
-v6eval/ct/spec/DH_Type01.html
-v6eval/ct/spec/DH_Type01.seq
-v6eval/ct/spec/DH_Type10.def
-v6eval/ct/spec/DH_Type10.html
-v6eval/ct/spec/DH_Type10.seq
-v6eval/ct/spec/DH_Type10toMC.def
-v6eval/ct/spec/DH_Type10toMC.html
-v6eval/ct/spec/DH_Type10toMC.seq
-v6eval/ct/spec/DH_Type11.def
-v6eval/ct/spec/DH_Type11.html
-v6eval/ct/spec/DH_Type11.seq
-v6eval/ct/spec/DH_Type11toMC.def
-v6eval/ct/spec/DH_Type11toMC.html
-v6eval/ct/spec/DH_Type11toMC.seq
-v6eval/ct/spec/DH_UnrecognizedNxtHdrFlood.def
-v6eval/ct/spec/DH_UnrecognizedNxtHdrFlood.html
-v6eval/ct/spec/DH_UnrecognizedNxtHdrFlood.seq
-v6eval/ct/spec/DH_UnrecognizedNxtHdrFlood2.def
-v6eval/ct/spec/DH_UnrecognizedNxtHdrFlood2.html
-v6eval/ct/spec/DH_UnrecognizedNxtHdrFlood2.seq
-v6eval/ct/spec/EH_HBHOptAfterDstOpt.def
-v6eval/ct/spec/EH_HBHOptAfterDstOpt.html
-v6eval/ct/spec/EH_HBHOptAfterDstOpt.seq
-v6eval/ct/spec/EH_UnrecognizedNextHeader.def
-v6eval/ct/spec/EH_UnrecognizedNextHeader.html
-v6eval/ct/spec/EH_UnrecognizedNextHeader.seq
-v6eval/ct/spec/FH_1stOnly.html
-v6eval/ct/spec/FH_1stOnly.seq
-v6eval/ct/spec/FH_2ndOnly.html
-v6eval/ct/spec/FH_2ndOnly.seq
-v6eval/ct/spec/FH_Big65535.def
-v6eval/ct/spec/FH_Big65535.html
-v6eval/ct/spec/FH_Big65535.seq
-v6eval/ct/spec/FH_Big65536.def
-v6eval/ct/spec/FH_Big65536.html
-v6eval/ct/spec/FH_Big65536.seq
-v6eval/ct/spec/FH_BigPayload.def
-v6eval/ct/spec/FH_Flood.def
-v6eval/ct/spec/FH_Flood.html
-v6eval/ct/spec/FH_Flood.seq
-v6eval/ct/spec/FH_InvalidLength.def
-v6eval/ct/spec/FH_InvalidLength.html
-v6eval/ct/spec/FH_InvalidLength.seq
-v6eval/ct/spec/FH_MixA1B1A2B2.html
-v6eval/ct/spec/FH_MixA1B1A2B2.seq
-v6eval/ct/spec/FH_MixA1B2A2B1.html
-v6eval/ct/spec/FH_MixA1B2A2B1.seq
-v6eval/ct/spec/FH_MixA2B1A1B2.html
-v6eval/ct/spec/FH_MixA2B1A1B2.seq
-v6eval/ct/spec/FH_MixA2B2A1B1.html
-v6eval/ct/spec/FH_MixA2B2A1B1.seq
-v6eval/ct/spec/FH_Needless.html
-v6eval/ct/spec/FH_Needless.seq
-v6eval/ct/spec/FH_Normal.html
-v6eval/ct/spec/FH_Normal.seq
-v6eval/ct/spec/FH_Overlap.def
-v6eval/ct/spec/FH_Overlap.html
-v6eval/ct/spec/FH_Overlap.seq
-v6eval/ct/spec/FH_Pre.html
-v6eval/ct/spec/FH_Pre.seq
-v6eval/ct/spec/FH_Reverse.html
-v6eval/ct/spec/FH_Reverse.seq
-v6eval/ct/spec/FL_NonZeroOverRouter.def
-v6eval/ct/spec/FL_NonZeroOverRouter.html
-v6eval/ct/spec/FL_NonZeroOverRouter.seq
-v6eval/ct/spec/FL_NonZeroToHost.def
-v6eval/ct/spec/FL_NonZeroToHost.html
-v6eval/ct/spec/FL_NonZeroToHost.seq
-v6eval/ct/spec/Fragment.def
-v6eval/ct/spec/HH.def
-v6eval/ct/spec/HH_BadHdrExtLen.def
-v6eval/ct/spec/HH_BadHdrExtLen.html
-v6eval/ct/spec/HH_BadHdrExtLen.seq
-v6eval/ct/spec/HH_BadHdrExtLenOverRouter.def
-v6eval/ct/spec/HH_BadHdrExtLenOverRouter.html
-v6eval/ct/spec/HH_BadHdrExtLenOverRouter.seq
-v6eval/ct/spec/HH_BadOptDataLen.def
-v6eval/ct/spec/HH_BadOptDataLen.html
-v6eval/ct/spec/HH_BadOptDataLen.seq
-v6eval/ct/spec/HH_BadOptDataLenOverRouter.def
-v6eval/ct/spec/HH_BadOptDataLenOverRouter.html
-v6eval/ct/spec/HH_BadOptDataLenOverRouter.seq
-v6eval/ct/spec/HH_Pad1.def
-v6eval/ct/spec/HH_Pad1.html
-v6eval/ct/spec/HH_Pad1.seq
-v6eval/ct/spec/HH_PadFlood.def
-v6eval/ct/spec/HH_PadFlood.html
-v6eval/ct/spec/HH_PadFlood.seq
-v6eval/ct/spec/HH_PadFloodOverRouter.def
-v6eval/ct/spec/HH_PadFloodOverRouter.html
-v6eval/ct/spec/HH_PadFloodOverRouter.seq
-v6eval/ct/spec/HH_PadN.def
-v6eval/ct/spec/HH_PadN.html
-v6eval/ct/spec/HH_PadN.seq
-v6eval/ct/spec/HH_Type00.def
-v6eval/ct/spec/HH_Type00.html
-v6eval/ct/spec/HH_Type00.seq
-v6eval/ct/spec/HH_Type01.def
-v6eval/ct/spec/HH_Type01.html
-v6eval/ct/spec/HH_Type01.seq
-v6eval/ct/spec/HH_Type10.def
-v6eval/ct/spec/HH_Type10.html
-v6eval/ct/spec/HH_Type10.seq
-v6eval/ct/spec/HH_Type10toMC.def
-v6eval/ct/spec/HH_Type10toMC.html
-v6eval/ct/spec/HH_Type10toMC.seq
-v6eval/ct/spec/HH_Type11.def
-v6eval/ct/spec/HH_Type11.html
-v6eval/ct/spec/HH_Type11.seq
-v6eval/ct/spec/HH_Type11toMC.def
-v6eval/ct/spec/HH_Type11toMC.html
-v6eval/ct/spec/HH_Type11toMC.seq
-v6eval/ct/spec/HL_OneToRouter.def
-v6eval/ct/spec/HL_OneToRouter.html
-v6eval/ct/spec/HL_OneToRouter.seq
-v6eval/ct/spec/HL_ZeroToHost.def
-v6eval/ct/spec/HL_ZeroToHost.html
-v6eval/ct/spec/HL_ZeroToHost.seq
-v6eval/ct/spec/HL_ZeroToRouter.def
-v6eval/ct/spec/HL_ZeroToRouter.html
-v6eval/ct/spec/HL_ZeroToRouter.seq
-v6eval/ct/spec/IH_BadIPv6Len.def
-v6eval/ct/spec/IH_BadIPv6Len.html
-v6eval/ct/spec/IH_BadIPv6Len.seq
-v6eval/ct/spec/IH_BadIPv6Ver.def
-v6eval/ct/spec/IH_BadIPv6Ver.html
-v6eval/ct/spec/IH_BadIPv6Ver.seq
-v6eval/ct/spec/IH_NoNextHeader.def
-v6eval/ct/spec/IH_NoNextHeader.html
-v6eval/ct/spec/IH_NoNextHeader.seq
-v6eval/ct/spec/IH_Router.def
-v6eval/ct/spec/IH_UnrecognizedNextHeader.def
-v6eval/ct/spec/IH_UnrecognizedNextHeader.html
-v6eval/ct/spec/IH_UnrecognizedNextHeader.seq
-v6eval/ct/spec/IH_UnrecognizedNxtHdrFlood.def
-v6eval/ct/spec/IH_UnrecognizedNxtHdrFlood.html
-v6eval/ct/spec/IH_UnrecognizedNxtHdrFlood.seq
-v6eval/ct/spec/INDEX
-v6eval/ct/spec/INDEX_config
-v6eval/ct/spec/INDEX_demo1
-v6eval/ct/spec/INDEX_demo2
-v6eval/ct/spec/INDEX_nodereq
-v6eval/ct/spec/INDEX_robust
-v6eval/ct/spec/INDEX_ume
-v6eval/ct/spec/INDEX_ume_router
-v6eval/ct/spec/Makefile
-v6eval/ct/spec/PL_OddOverRouter.def
-v6eval/ct/spec/PL_OddOverRouter.html
-v6eval/ct/spec/PL_OddOverRouter.seq
-v6eval/ct/spec/PL_OddToHost.def
-v6eval/ct/spec/PL_OddToHost.html
-v6eval/ct/spec/PL_OddToHost.seq
-v6eval/ct/spec/PingOverRouter.def
-v6eval/ct/spec/PingOverRouter.html
-v6eval/ct/spec/PingOverRouter.seq
-v6eval/ct/spec/PingToHost.def
-v6eval/ct/spec/PingToHost.html
-v6eval/ct/spec/PingToHost.seq
-v6eval/ct/spec/RH.def
-v6eval/ct/spec/RH_AddressLoop.def
-v6eval/ct/spec/RH_AddressLoop.html
-v6eval/ct/spec/RH_AddressLoop.seq
-v6eval/ct/spec/RH_AtHost.def
-v6eval/ct/spec/RH_AtHost.html
-v6eval/ct/spec/RH_AtHost.seq
-v6eval/ct/spec/RH_BadHdrExtLen.def
-v6eval/ct/spec/RH_BadHdrExtLen.html
-v6eval/ct/spec/RH_BadHdrExtLen.seq
-v6eval/ct/spec/RH_DuplicateAddress.def
-v6eval/ct/spec/RH_DuplicateAddress.html
-v6eval/ct/spec/RH_DuplicateAddress.seq
-v6eval/ct/spec/RH_FromSourceNode.def
-v6eval/ct/spec/RH_FromSourceNode.html
-v6eval/ct/spec/RH_FromSourceNode.seq
-v6eval/ct/spec/RH_HdrExtLenOdd.def
-v6eval/ct/spec/RH_HdrExtLenOdd.html
-v6eval/ct/spec/RH_HdrExtLenOdd.seq
-v6eval/ct/spec/RH_IntermediateNode.def
-v6eval/ct/spec/RH_IntermediateNode.html
-v6eval/ct/spec/RH_IntermediateNode.seq
-v6eval/ct/spec/RH_MulticastAddress.def
-v6eval/ct/spec/RH_MulticastAddress.html
-v6eval/ct/spec/RH_MulticastAddress.seq
-v6eval/ct/spec/RH_RoutingTypeNonZero.def
-v6eval/ct/spec/RH_RoutingTypeNonZero.html
-v6eval/ct/spec/RH_RoutingTypeNonZero.seq
-v6eval/ct/spec/RH_SegmentsLeftBig.def
-v6eval/ct/spec/RH_SegmentsLeftBig.html
-v6eval/ct/spec/RH_SegmentsLeftBig.seq
-v6eval/ct/spec/RH_ToDestinationNode.def
-v6eval/ct/spec/RH_ToDestinationNode.html
-v6eval/ct/spec/RH_ToDestinationNode.seq
-v6eval/ct/spec/SPEC.html
-v6eval/ct/spec/SPEC.pm
-v6eval/ct/spec/TC_NonZeroOverRouter.def
-v6eval/ct/spec/TC_NonZeroOverRouter.html
-v6eval/ct/spec/TC_NonZeroOverRouter.seq
-v6eval/ct/spec/TC_NonZeroToHost.def
-v6eval/ct/spec/TC_NonZeroToHost.html
-v6eval/ct/spec/TC_NonZeroToHost.seq
-v6eval/ct/spec/index.html
-v6eval/ct/stateless-addrconf/.footer
-v6eval/ct/stateless-addrconf/00README
-v6eval/ct/stateless-addrconf/ADDRCONFFail.seq
-v6eval/ct/stateless-addrconf/ADDRCONFManytime.seq
-v6eval/ct/stateless-addrconf/ADDRCONFSuccess.seq
-v6eval/ct/stateless-addrconf/ADDRSTATE_dep_dep.def
-v6eval/ct/stateless-addrconf/ADDRSTATE_dep_pref.def
-v6eval/ct/stateless-addrconf/ADDRSTATE_inval_dep.def
-v6eval/ct/stateless-addrconf/ADDRSTATE_inval_inval.def
-v6eval/ct/stateless-addrconf/ADDRSTATE_not_reset_VLT.seq
-v6eval/ct/stateless-addrconf/ADDRSTATE_pkt_receiving.seq
-v6eval/ct/stateless-addrconf/ADDRSTATE_reset_VLT.seq
-v6eval/ct/stateless-addrconf/ADDRSTATE_sameprfxes_order.seq
-v6eval/ct/stateless-addrconf/ADDRSTATE_src_select.seq
-v6eval/ct/stateless-addrconf/BASIC.def
-v6eval/ct/stateless-addrconf/BASIC.def.pktdesc
-v6eval/ct/stateless-addrconf/BASICRA.def
-v6eval/ct/stateless-addrconf/BASIC_addrstate.def
-v6eval/ct/stateless-addrconf/BASIC_init.def
-v6eval/ct/stateless-addrconf/BASIC_init.def.pktdesc
-v6eval/ct/stateless-addrconf/BEGIN.seq
-v6eval/ct/stateless-addrconf/DAD.def
-v6eval/ct/stateless-addrconf/DAD.pm
-v6eval/ct/stateless-addrconf/DADFail_DADPostSendNS.seq
-v6eval/ct/stateless-addrconf/DADFail_DADPreSendNS.seq
-v6eval/ct/stateless-addrconf/DADSendNS_DADPostSendNS.seq
-v6eval/ct/stateless-addrconf/DADSuccess_DADPostSendNS.seq
-v6eval/ct/stateless-addrconf/END.seq
-v6eval/ct/stateless-addrconf/GLOBAL0.def
-v6eval/ct/stateless-addrconf/GLOBAL0A0N.def
-v6eval/ct/stateless-addrconf/GLOBAL0A0N_ACAST.def
-v6eval/ct/stateless-addrconf/GLOBAL0A0N_invalNS_dst_allnodes.def
-v6eval/ct/stateless-addrconf/GLOBAL0A0N_invalNS_dst_tentative.def
-v6eval/ct/stateless-addrconf/GLOBAL0A0N_unspecNA_dst_solnode.def
-v6eval/ct/stateless-addrconf/GLOBAL0A0N_valNA_SameMacAddr.def
-v6eval/ct/stateless-addrconf/GLOBAL0A0N_valNS_SameMacAddr.def
-v6eval/ct/stateless-addrconf/GLOBAL0_irregRA_prfxopt_ignore_PLTgtVLT.def
-v6eval/ct/stateless-addrconf/GLOBAL0_irregRA_prfxopt_ignore_PRFXLENgt128.def
-v6eval/ct/stateless-addrconf/GLOBAL0_irregRA_prfxopt_ignore_PRFXLENgt64.def
-v6eval/ct/stateless-addrconf/GLOBAL0_irregRA_prfxopt_ignore_PRFXLENlt64.def
-v6eval/ct/stateless-addrconf/GLOBAL0_irregRA_prfxopt_ignore_VLT0.def
-v6eval/ct/stateless-addrconf/GLOBAL0_irregRA_prfxopt_ignore_af0.def
-v6eval/ct/stateless-addrconf/GLOBAL0_irregRA_prfxopt_ignore_lf0.def
-v6eval/ct/stateless-addrconf/GLOBAL0_supRA_ManyLinkLayerOpt.def
-v6eval/ct/stateless-addrconf/GLOBAL0_valRA.def
-v6eval/ct/stateless-addrconf/GLOBAL0_valRA.def.pktdesc
-v6eval/ct/stateless-addrconf/GLOBAL0_valRA_NoLLOCAL.def
-v6eval/ct/stateless-addrconf/GLOBAL0_valRA_multiprfxopt_lt.def
-v6eval/ct/stateless-addrconf/GLOBAL0_valRA_sameprfxes.def
-v6eval/ct/stateless-addrconf/GLOBAL0_valRA_shortlt.def
-v6eval/ct/stateless-addrconf/GLOBAL0_valRA_vlt60plt30.def
-v6eval/ct/stateless-addrconf/GLOBAL_irregRA_prfxopt_ignore_mcast.def
-v6eval/ct/stateless-addrconf/GLOBAL_manyprfxopt.def
-v6eval/ct/stateless-addrconf/INDEX_BEGIN
-v6eval/ct/stateless-addrconf/INDEX_BEGIN_demo1
-v6eval/ct/stateless-addrconf/INDEX_BEGIN_demo2
-v6eval/ct/stateless-addrconf/INDEX_BEGIN_routerdemo1
-v6eval/ct/stateless-addrconf/INDEX_END
-v6eval/ct/stateless-addrconf/INDEX_LLA
-v6eval/ct/stateless-addrconf/INDEX_RA
-v6eval/ct/stateless-addrconf/INDEX_UME_HOST
-v6eval/ct/stateless-addrconf/INDEX_UME_ROUTER
-v6eval/ct/stateless-addrconf/INDEX_host
-v6eval/ct/stateless-addrconf/INDEX_host_demo1
-v6eval/ct/stateless-addrconf/INDEX_host_demo2
-v6eval/ct/stateless-addrconf/INDEX_host_suprise
-v6eval/ct/stateless-addrconf/INDEX_hostrouter
-v6eval/ct/stateless-addrconf/INDEX_hostrouter_demo1
-v6eval/ct/stateless-addrconf/INDEX_hostrouter_demo2
-v6eval/ct/stateless-addrconf/INDEX_hostrouter_routerdemo1
-v6eval/ct/stateless-addrconf/INDEX_router
-v6eval/ct/stateless-addrconf/INDEX_seq
-v6eval/ct/stateless-addrconf/LLA_DADSuccess.html
-v6eval/ct/stateless-addrconf/LLA_DADSuccess.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NAPostDAD_DiffTgt.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NAPostDAD_DiffTgt.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NAPostDAD_HL254.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NAPostDAD_HL254.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NAPostDAD_SF1.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NAPostDAD_SF1.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NAPostDAD_SameTgt.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NAPostDAD_SameTgt.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NAPostDAD_wSLL.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NAPostDAD_wSLL.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NAPostDAD_woTLL.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NAPreDAD_DiffTgt.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NAPreDAD_DiffTgt.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NAPreDAD_SameTgt.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NAPreDAD_SameTgt.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPostDAD_DiffTgt.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPostDAD_DiffTgt.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPostDAD_DstAll.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPostDAD_DstAll.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPostDAD_DstTent.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPostDAD_DstTent.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPostDAD_HL254.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPostDAD_HL254.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPostDAD_SameTgt.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPostDAD_SameTgt.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPostDAD_SrcDstUni.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPostDAD_SrcDstUni.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPostDAD_SrcUni.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPostDAD_SrcUni.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPostDAD_wSLL.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPostDAD_wSLL.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPreDAD_DiffTgt.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPreDAD_DiffTgt.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPreDAD_SameTgt.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPreDAD_SameTgt.seq
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPreDAD_SrcUni.html
-v6eval/ct/stateless-addrconf/LLA_DAD_NSPreDAD_SrcUni.seq
-v6eval/ct/stateless-addrconf/LLA_SAA.def
-v6eval/ct/stateless-addrconf/LLOCAL.def
-v6eval/ct/stateless-addrconf/LLOCAL.def.pktdesc
-v6eval/ct/stateless-addrconf/LLOCAL0A0N.def
-v6eval/ct/stateless-addrconf/LLOCAL0A0N_ACAST.def
-v6eval/ct/stateless-addrconf/LLOCAL_invalNA_hoplimit.def
-v6eval/ct/stateless-addrconf/LLOCAL_invalNA_sflag1.def
-v6eval/ct/stateless-addrconf/LLOCAL_invalNS_dst_allnodes.def
-v6eval/ct/stateless-addrconf/LLOCAL_invalNS_dst_tentative.def
-v6eval/ct/stateless-addrconf/LLOCAL_invalNS_hoplimit.def
-v6eval/ct/stateless-addrconf/LLOCAL_invalNS_sllopt.def
-v6eval/ct/stateless-addrconf/LLOCAL_irregNA_notllopt.def
-v6eval/ct/stateless-addrconf/LLOCAL_irregNS_src_ucast.def
-v6eval/ct/stateless-addrconf/LLOCAL_irregRA_prfxopt_ignore_llocal.def
-v6eval/ct/stateless-addrconf/LLOCAL_sample.def
-v6eval/ct/stateless-addrconf/LLOCAL_supNA_ManyOptions.def
-v6eval/ct/stateless-addrconf/LLOCAL_supNS_prfxopt.def
-v6eval/ct/stateless-addrconf/LLOCAL_unspecNA_dst_solnode.def
-v6eval/ct/stateless-addrconf/LLOCAL_unspecNA_dst_ucast.def
-v6eval/ct/stateless-addrconf/LLOCAL_valNA_DiffMacAddr.def
-v6eval/ct/stateless-addrconf/LLOCAL_valNA_SameMacAddr.def
-v6eval/ct/stateless-addrconf/LLOCAL_valNS_DiffMacAddr.def
-v6eval/ct/stateless-addrconf/LLOCAL_valNS_SameMacAddr.def
-v6eval/ct/stateless-addrconf/Makefile
-v6eval/ct/stateless-addrconf/RA_BOTH_mRAmPXmRT.seq
-v6eval/ct/stateless-addrconf/RA_BOTH_mRAmPXsRT.seq
-v6eval/ct/stateless-addrconf/RA_BOTH_sRAmPXsRT.seq
-v6eval/ct/stateless-addrconf/RA_GA_Success.seq
-v6eval/ct/stateless-addrconf/RA_SAA.def
-v6eval/ct/stateless-addrconf/RA_SLA_Success.seq
-v6eval/ct/stateless-addrconf/RA_decVLT.seq
-v6eval/ct/stateless-addrconf/RA_incVLT.seq
-v6eval/ct/stateless-addrconf/RA_mGA_mRAmPXmRT.seq
-v6eval/ct/stateless-addrconf/RA_mGA_mRAmPXsRT.seq
-v6eval/ct/stateless-addrconf/RA_mGA_sRAmPXsRT.seq
-v6eval/ct/stateless-addrconf/RA_sameVLT.seq
-v6eval/ct/stateless-addrconf/RA_wAF0.seq
-v6eval/ct/stateless-addrconf/RA_wHL254.seq
-v6eval/ct/stateless-addrconf/RA_wPLTgtVLT.seq
-v6eval/ct/stateless-addrconf/RA_wPXLEN130.seq
-v6eval/ct/stateless-addrconf/RA_wPXLEN48.seq
-v6eval/ct/stateless-addrconf/RA_wPXLEN96.seq
-v6eval/ct/stateless-addrconf/RA_wPXLLA.seq
-v6eval/ct/stateless-addrconf/RA_wVLT0.seq
-v6eval/ct/stateless-addrconf/SAA.def
-v6eval/ct/stateless-addrconf/SAA.pm
-v6eval/ct/stateless-addrconf/SLOCAL0.def
-v6eval/ct/stateless-addrconf/SLOCAL0_valRA.def
-v6eval/ct/stateless-addrconf/SLOCAL0_valRA_vlt60plt30.def
-v6eval/ct/stateless-addrconf/index.html
-v6eval/ct/stateless-addrconf/showhead.seq
-v6eval/ct/tunnel/.footer
-v6eval/ct/tunnel/00README
-v6eval/ct/tunnel/INDEX_host_router
-v6eval/ct/tunnel/Makefile
-v6eval/ct/tunnel/automatic_decapsulation_host.def
-v6eval/ct/tunnel/automatic_decapsulation_host.html
-v6eval/ct/tunnel/automatic_decapsulation_host.seq
-v6eval/ct/tunnel/automatic_encapsulation_host.def
-v6eval/ct/tunnel/automatic_encapsulation_host.html
-v6eval/ct/tunnel/automatic_encapsulation_host.seq
-v6eval/ct/tunnel/automatic_encapsulation_router.def
-v6eval/ct/tunnel/automatic_encapsulation_router.html
-v6eval/ct/tunnel/automatic_encapsulation_router.seq
-v6eval/ct/tunnel/decapsulation_host.def
-v6eval/ct/tunnel/decapsulation_host.html
-v6eval/ct/tunnel/decapsulation_host.seq
-v6eval/ct/tunnel/decapsulation_router.def
-v6eval/ct/tunnel/decapsulation_router.html
-v6eval/ct/tunnel/decapsulation_router.seq
-v6eval/ct/tunnel/encapsulation_host.def
-v6eval/ct/tunnel/encapsulation_host.html
-v6eval/ct/tunnel/encapsulation_host.seq
-v6eval/ct/tunnel/encapsulation_router.def
-v6eval/ct/tunnel/encapsulation_router.html
-v6eval/ct/tunnel/encapsulation_router.seq
-v6eval/ct/tunnel/fragment.def
-v6eval/ct/tunnel/fragment.html
-v6eval/ct/tunnel/fragment.seq
-v6eval/ct/tunnel/hoplimit.def
-v6eval/ct/tunnel/hoplimit.html
-v6eval/ct/tunnel/hoplimit.seq
-v6eval/ct/tunnel/icmpv4.def
-v6eval/ct/tunnel/icmpv4.html
-v6eval/ct/tunnel/icmpv4.seq
-v6eval/ct/tunnel/index.html
-v6eval/ct/tunnel/ingress_filtering.def
-v6eval/ct/tunnel/ingress_filtering.html
-v6eval/ct/tunnel/ingress_filtering.seq
-v6eval/ct/tunnel/initialize.html
-v6eval/ct/tunnel/initialize.seq
-v6eval/ct/tunnel/tunnel.def
-v6eval/ct/tunnel/tunnel.pm
-v6eval/doc/00README.ct
-v6eval/doc/CHANGELOG.ct
-v6eval/doc/INSTALL.ct
-@dirrmtry v6eval/doc
-@dirrm v6eval/ct/dd
-@dirrm v6eval/ct/default-addr-select
-@dirrm v6eval/ct/icmp
-@dirrm v6eval/ct/ipsec
-@dirrm v6eval/ct/ipsec-udp
-@dirrm v6eval/ct/ipsec4
-@dirrm v6eval/ct/ipsec4-udp
-@dirrm v6eval/ct/mip6-cn-20
-@dirrm v6eval/ct/mip6-ha-20
-@dirrm v6eval/ct/mip6-mn-20
-@dirrm v6eval/ct/natpt
-@dirrm v6eval/ct/nd
-@dirrm v6eval/ct/pd
-@dirrm v6eval/ct/pmtu
-@dirrm v6eval/ct/robust
-@dirrm v6eval/ct/router-select
-@dirrm v6eval/ct/spec
-@dirrm v6eval/ct/stateless-addrconf
-@dirrm v6eval/ct/tunnel
-@dirrm v6eval/ct
diff --git a/net/entitymib/Makefile b/net/entitymib/Makefile
deleted file mode 100644
index 088ddc2d29b6..000000000000
--- a/net/entitymib/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# Created by: Garrett Wollman <wollman@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	entitymib
-PORTVERSION=	20040109
-PORTREVISION=	2
-CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://www.mibexplorer.com/export/ietf/:mibs
-MASTER_SITE_SUBDIR=	wollman
-DISTFILES=	entitymib entitymib.1 ENTITY-MIB.txt:mibs
-EXTRACT_ONLY=
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=Display the Entity MIB of an SNMP agent
-
-RUN_DEPENDS=	p5-Tree-DAG_Node>=0:${PORTSDIR}/devel/p5-Tree-DAG_Node \
-		net-snmp>=0:${PORTSDIR}/net-mgmt/net-snmp
-
-USES=		perl5
-USE_PERL5=	run
-MAN1=		entitymib.1
-
-NO_BUILD=	nope
-
-NO_STAGE=	yes
-do-install:
-	${INSTALL_SCRIPT} ${DISTDIR}/entitymib ${PREFIX}/bin/entitymib
-	${INSTALL_MAN} ${DISTDIR}/entitymib.1 ${MANPREFIX}/man/man1
-	${INSTALL_DATA} ${DISTDIR}/ENTITY-MIB.txt ${PREFIX}/share/snmp/mibs
-
-.include <bsd.port.mk>
diff --git a/net/entitymib/distinfo b/net/entitymib/distinfo
deleted file mode 100644
index d131c2960510..000000000000
--- a/net/entitymib/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-SHA256 (entitymib) = 5c5934cbc6f432f3ef6de8f3ba47289dc99e1a86e8dcca00118b765bfb79244c
-SIZE (entitymib) = 11223
-SHA256 (entitymib.1) = f4c583c33898a5ac9a9568267996dfb9f040329e3458695d668da22c04775f77
-SIZE (entitymib.1) = 7117
-SHA256 (ENTITY-MIB.txt) = f4d0fe753581afb7ebfcd68ddee5338a1e2a8536e31a3c60b86d30cae8ccc8b9
-SIZE (ENTITY-MIB.txt) = 45486
diff --git a/net/entitymib/pkg-descr b/net/entitymib/pkg-descr
deleted file mode 100644
index 2169cdd503c9..000000000000
--- a/net/entitymib/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-entitymib is a utility for displaying the physical configuration of an
-SNMPv2c or v3 agent using the SNMP Entity MIB, and, for certain Cisco
-Systems switches, displaying additional sensor and configuration
-information from proprietary MIBs (which must be obtained separately).
-
-entitymib is written entirely in Perl, but it uses the NetSNMP library
-through its Perl binding, SNMP(3), and requires that NetSNMP's MIB
-directories be correctly configured to provide, at a minimum, the
-Entity MIB.
diff --git a/net/entitymib/pkg-message b/net/entitymib/pkg-message
deleted file mode 100644
index e10b9d5c5b3c..000000000000
--- a/net/entitymib/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-In order to use the full functionality of entitymib for Cisco
-switches, you must obtain and install the following Cisco proprietary
-MIB modules:
-
-	CISCO-ENTITY-SENSOR-MIB
-	CISCO-ENTITY-ASSET-MIB
-	CISCO-ENTITY-EXT-MIB
-
-Not all MIBs are supported by all Cisco switches.
diff --git a/net/entitymib/pkg-plist b/net/entitymib/pkg-plist
deleted file mode 100644
index fde3b62602ca..000000000000
--- a/net/entitymib/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/entitymib
-share/snmp/mibs/ENTITY-MIB.txt
diff --git a/net/freedbd/Makefile b/net/freedbd/Makefile
deleted file mode 100644
index cf392732ba81..000000000000
--- a/net/freedbd/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# Created by: Ed Schouten <ed@fxq.nl>
-# $FreeBSD$
-
-PORTNAME=	freedbd
-PORTVERSION=	0.1
-PORTREVISION=	1
-CATEGORIES=	net audio
-MASTER_SITES=	http://rink.nu/downloads/projects/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Lightweight daemon for answering FreeDB queries
-
-USES=		perl5
-USE_PERL5=	run
-GNU_CONFIGURE=	yes
-WANT_GNOME=	yes
-
-PLIST_FILES=	bin/freedbd bin/freedbd-txt2xml %%EXAMPLESDIR%%/sample_db.txt
-PLIST_DIRS=	%%EXAMPLESDIR%%
-
-OPTIONS_DEFINE=	XML
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MXML}
-USE_GNOME+=	libxml2
-CONFIGURE_ARGS+=--with-xml
-RUN_DEPENDS+=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-PLIST_FILES+=	bin/freedbd-parse %%EXAMPLESDIR%%/sample_db.xml
-.endif
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/txt2xml.pl ${PREFIX}/bin/freedbd-txt2xml
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/sample_db.txt ${EXAMPLESDIR}
-.if ${PORT_OPTIONS:MXML}
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/db_parse.pl ${PREFIX}/bin/freedbd-parse
-	${INSTALL_DATA} ${WRKSRC}/examples/sample_db.xml ${EXAMPLESDIR}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/freedbd/distinfo b/net/freedbd/distinfo
deleted file mode 100644
index 19d3ae8396ec..000000000000
--- a/net/freedbd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (freedbd-0.1.tar.gz) = 9d3f75f4036357181925da7110f327f99f2701472f5c044d82663139923e81e6
-SIZE (freedbd-0.1.tar.gz) = 82780
diff --git a/net/freedbd/pkg-descr b/net/freedbd/pkg-descr
deleted file mode 100644
index c63ee18c564d..000000000000
--- a/net/freedbd/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-FreeDBD is a lightweight daemon for answering FreeDB queries, used to identify
-CD's. It understands text (ini-like) and XML databases and is very useful if
-you need a local CDDB server.
-
-WWW: http://rink.nu/
diff --git a/net/frickin/Makefile b/net/frickin/Makefile
deleted file mode 100644
index e983ba91ebed..000000000000
--- a/net/frickin/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Created by: Alex Miller <asm@asm.kiev.ua>
-# $FreeBSD$
-
-PORTNAME=	frickin
-DISTVERSION=	2.0BETA2
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	SF/${PORTNAME}/OldFiles
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Frickin PPTP Proxy
-
-MAKE_JOBS_UNSAFE=	yes
-USE_RC_SUBR=	frickin
-SUB_FILES=	pkg-message
-PORTDOCS=	INSTALL LICENSE
-PLIST_FILES=	sbin/frickin2 etc/frickin.conf.sample
-
-NO_STAGE=	yes
-post-extract:
-	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g;' \
-	${WRKSRC}/src/Makefile.FreeBSD
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME}2 ${PREFIX}/sbin/${PORTNAME}2
-	${INSTALL_DATA} ${WRKSRC}/frickin.conf.default ${PREFIX}/etc/frickin.conf.sample
-
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/net/frickin/distinfo b/net/frickin/distinfo
deleted file mode 100644
index 93e0647fe7df..000000000000
--- a/net/frickin/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (frickin-2.0BETA2.tgz) = 4b466a33e3761d44892fd80777e550b33204363002a5b592fa67f1400616d2e8
-SIZE (frickin-2.0BETA2.tgz) = 477451
diff --git a/net/frickin/files/frickin.in b/net/frickin/files/frickin.in
deleted file mode 100644
index 87776cac2678..000000000000
--- a/net/frickin/files/frickin.in
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# Startup script for frickin PPTP proxy.
-#
-# $FreeBSD$
-#
-
-# REQUIRE: DAEMON
-
-# Define these frickin_* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#       /etc/rc.conf.d/frickin
-#
-# frickin_enable : bool
-#   Enable the transport ("YES") or not ("NO", the default).
-# frickin_config : string
-#   Path to config file
-#
-
-frickin_enable=${frickin_enable-"NO"}
-frickin_conf=${frickin_conf-""}
-
-. /etc/rc.subr
-
-
-name="frickin"
-rcvar=frickin_enable
-
-load_rc_config ${name}
-
-command="%%PREFIX%%/sbin/${name}2"
-
-if [ ! -z "${frickin_conf}" -a -f ${frickin_conf} ]; then
-	frickin_flags="-c ${frickin_conf}"
-fi
-
-run_rc_command "$1"
diff --git a/net/frickin/files/patch-session.cpp b/net/frickin/files/patch-session.cpp
deleted file mode 100644
index 886d180c22f5..000000000000
--- a/net/frickin/files/patch-session.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/session.cpp.orig	2007-01-13 19:28:47.000000000 +0200
-+++ src/session.cpp	2008-07-03 16:33:51.000000000 +0300
-@@ -130,7 +130,7 @@
- 
- Session* Session::detatch(Client* a_Client)
- {
--    list<Client*>::iterator clientIter = NULL;
-+    list<Client*>::iterator clientIter = m_ClientList.end();
- 
-     assert(a_Client);
-     clientIter = find(m_ClientList.begin(), m_ClientList.end(), a_Client);
diff --git a/net/frickin/files/pkg-message.in b/net/frickin/files/pkg-message.in
deleted file mode 100644
index 92bf3168d212..000000000000
--- a/net/frickin/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-Please read %%DOCSDIR%%/INSTALL
-for detailed instructions how to use this port.
-
-echo frickin_enable=\"YES\" >> /etc/rc.conf 
-
-and
-
-cp %%PREFIX%%/etc/frickin.conf.sample %%PREFIX%%/etc/frickin.conf
-
-Edit it for your needs before first run.
diff --git a/net/frickin/pkg-descr b/net/frickin/pkg-descr
deleted file mode 100644
index f5f8a3bc61ee..000000000000
--- a/net/frickin/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Frickin PPTP Proxy is a way to NAT as many PPTP connections as you like
-through your OpenBSD PF firewall.
-
-WWW: http://frickin.sourceforge.net/
diff --git a/net/fspd/Makefile b/net/fspd/Makefile
deleted file mode 100644
index 32bdcdb87a27..000000000000
--- a/net/fspd/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-# Created by: trevor
-# $FreeBSD$
-
-PORTNAME=	fspd
-PORTVERSION=	2.8.1.26
-CATEGORIES=	net
-MASTER_SITES=	SF/fsp/fsp/2.8.1b26
-DISTNAME=	fsp-2.8.1b26
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	FSP daemon, clients, and scanner
-
-BUILD_DEPENDS=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
-
-CLIENTS=	fcatcmd fcdcmd fducmd ffindcmd fgetcmd fgrabcmd fhostcmd \
-		flscmd fmkdir fprocmd fput frmcmd frmdircmd fver fspmerge \
-		fstatcmd fmvcmd fbye fsetupcmd
-DOCDIR=		share/doc/${PORTNAME}
-PORTDOCS=	BETA.README COPYRIGHT ChangeLog FILES INFO INSTALL MACHINES \
-		TODO PROTOCOL HISTORY faq.html fsp-faq.html
-MAN1=		fcatcmd.1 fcdcmd.1 fducmd.1 ffindcmd.1 fgetcmd.1 fgrabcmd.1 \
-		fhostcmd.1 flscmd.1 fmkdir.1 fprocmd.1 fput.1 \
-		frmcmd.1 frmdircmd.1 fspd.1 fspscan.1 fver.1 \
-		fstatcmd.1 fmvcmd.1 fsetupcmd.1
-MAN5=		fsp_prof.5 fspsites.5
-MAN7=		fsp_env.7
-MLINKS=		fcatcmd.1 fcat.1 fcdcmd.1 fcd.1 fducmd.1 fdu.1 \
-		ffindcmd.1 ffind.1 fgetcmd.1 fget.1 fgrabcmd.1 fgrab.1 \
-		fhostcmd.1 fhost.1 flscmd.1 fls.1 fprocmd.1 fpro.1 \
-		frmdircmd.1 frmdir.1 fstatcmd.1 fstat.1 fmvcmd.1 fmv.1 \
-		fsetupcmd.1 fsetup.1
-
-USES=		scons tar:bzip2
-WRKSRC=		${WRKDIR}/${DISTNAME}
-
-OPTIONS_DEFINE=	NOCLIENTS INFINITE
-NOCLIENTS_DESC=	Omit client commands
-INFINITE_DESC=	Infinite retry in client commands
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MINFINITE}
-MAKE_ARGS+=	disable-timeout=yes
-.endif
-
-.if ! ${PORT_OPTIONS:MNOCLIENTS}
-.for command in ${CLIENTS}
-PLIST_FILES+=	bin/${command}
-.endfor
-.else
-SCONS_ARGS+=	without-clients=yes
-.endif
-
-PLIST_FILES+=	etc/fspd.conf.sample bin/fspscan bin/fspd
-
-post-extract:
-	@${CP} ${WRKSRC}/doc/PROTOCOL ${WRKSRC}
-	@${CP} ${WRKSRC}/doc/HISTORY ${WRKSRC}
-
-post-build:
-	@${CP} ${WRKSRC}/doc/*.html ${WRKSRC}
-
-do-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
-.endif
-.if ! ${PORT_OPTIONS:MNOCLIENTS}
-.for command in ${CLIENTS}
-	${INSTALL_PROGRAM} ${WRKSRC}/clients/${command} ${PREFIX}/bin
-.endfor
-.endif
-	${INSTALL_PROGRAM} ${WRKSRC}/contrib/fspscan ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/server/fspd ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/fspd.conf ${PREFIX}/etc/fspd.conf.sample
-.for page in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/man/${page} ${PREFIX}/man/man1
-.endfor
-.for page in ${MAN5}
-	${INSTALL_MAN} ${WRKSRC}/man/${page} ${PREFIX}/man/man5
-.endfor
-	${INSTALL_MAN} ${WRKSRC}/man/${MAN7} ${PREFIX}/man/man7
-
-.include <bsd.port.post.mk>
diff --git a/net/fspd/distinfo b/net/fspd/distinfo
deleted file mode 100644
index 20f4531bbe1c..000000000000
--- a/net/fspd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (fsp-2.8.1b26.tar.bz2) = b3196931502e375e5389cf6a0fc2d0610d3f83433c9e390bd4615e284aad2fdd
-SIZE (fsp-2.8.1b26.tar.bz2) = 151814
diff --git a/net/fspd/files/patch-bsd_src-print.c b/net/fspd/files/patch-bsd_src-print.c
deleted file mode 100644
index 7ef9eb2e710b..000000000000
--- a/net/fspd/files/patch-bsd_src-print.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- bsd_src/print.c.orig	2009-10-01 13:46:36.000000000 -0700
-+++ bsd_src/print.c	2011-12-06 13:05:42.177765575 -0800
-@@ -32,7 +32,11 @@
- #include <sys/param.h>
- #include <grp.h>
- #include <pwd.h>
-+#if defined(__FreeBSD_version) && __FreeBSD_version > 900007
-+#include <utmpx.h>
-+#else
- #include <utmp.h>
-+#endif
- #ifdef TIME_WITH_SYS_TIME
- #  include <sys/time.h>
- #  include <time.h>
diff --git a/net/fspd/pkg-descr b/net/fspd/pkg-descr
deleted file mode 100644
index 3cde180aa3cd..000000000000
--- a/net/fspd/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-This is a server daemon, port scanner and (optionally) clients for FSP, the File
-Service Protocol.
- 
-FSP is lightweight and connectionless.  It is typically used for offering files
-to "anonymous" visitors over a congested link.  It uses UDP rather than TCP
-sockets.  A service contact port (well-known port) for FSP has not been assigned
-by IANA (per RFC 1700).  See <URL:http://www.faqs.org/faqs/fsp-faq/> for an
-overview.
-
-To use fspd, you must copy the fspd.conf.sample file, normally installed in
-/usr/local/etc/, to fspd.conf and edit it.
-
-You can run fspd from inetd or stand-alone.
-
-WWW:  http://fsp.sourceforge.net/
diff --git a/net/hawknl-devel/Makefile b/net/hawknl-devel/Makefile
deleted file mode 100644
index 70b4f747c7a8..000000000000
--- a/net/hawknl-devel/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-# $FreeBSD$
-
-PORTNAME=	hawknl
-PORTVERSION=	1.70
-CATEGORIES=	net devel
-MASTER_SITES=	http://www.hawksoft.com/download/files/
-PKGNAMESUFFIX=	-devel
-DISTNAME=	HawkNL17b1src
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Portable networking library (devel)
-
-CONFLICTS=	hawknl-[0-9]*
-
-USES=		dos2unix gmake zip
-MAKEFILE=	makefile.linux
-USE_LDCONFIG=	yes
-
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CPPFLAGS+=	-I${LOCALBASE}/include
-
-WRKSRC=	${WRKDIR}/HawkNL1.70
-
-OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == amd64 || ${ARCH} == ia64
-BROKEN=		does not compile on ${ARCH}
-.endif
-
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-CFLAGS+=	-funroll-all-loops -ffast-math -fomit-frame-pointer -D_GNU_SOURCE -D_REENTRANT
-.endif
-
-post-patch:
-	${REINPLACE_CMD} -e 's|make -f|${MAKE_CMD} -f|g' ${WRKSRC}/${MAKEFILE}
-	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/nlinternal.h ${WRKSRC}/src/htinternal.h
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for FILE in readme.txt NLchanges.txt
-	@${INSTALL_DATA} ${WRKSRC}/src/${FILE} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/hawknl-devel/distinfo b/net/hawknl-devel/distinfo
deleted file mode 100644
index a1fe78a4493d..000000000000
--- a/net/hawknl-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (hawknl/HawkNL17b1src.zip) = 9583b08a523e38a1c6a70a99df150bbb42616f836c5ed7ec5bf0b32f1cad8ae3
-SIZE (hawknl/HawkNL17b1src.zip) = 228389
diff --git a/net/hawknl-devel/files/patch-src_htcondition.c b/net/hawknl-devel/files/patch-src_htcondition.c
deleted file mode 100644
index 08aef0fa79d7..000000000000
--- a/net/hawknl-devel/files/patch-src_htcondition.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/htcondition.c	Sun Mar  5 16:05:39 2006
-+++ src/htcondition.c	Sun Mar  5 16:06:17 2006
-@@ -37,8 +37,6 @@
- 
- #else /* !HT_WIN_THREADS */
- 
--#include <sys/timeb.h>
--
- #ifdef HL_WINDOWS_APP
- #define timeb _timeb
- #define ftime _ftime
-@@ -156,13 +154,14 @@
- #else
-         int                 result = 0;
-         struct timespec     tv;
--        struct timeb        t;
-+        struct timeval       t;
-+        struct timezone     tz;
-         long                ms;
- 
-         /* convert timeout to an absolute time */
--        ftime(&t);
--        ms = t.millitm + timeout;
--        tv.tv_sec = t.time + (ms / 1000);
-+	gettimeofday(&t, &tz);
-+        ms = (t.tv_sec * 1000) + timeout;
-+        tv.tv_sec = t.tv_sec + (ms / 1000);
-         tv.tv_nsec = (ms % 1000) * 1000000;
- 
-         (void)pthread_mutex_lock((pthread_mutex_t *)&cv->mutex);
diff --git a/net/hawknl-devel/files/patch-src_makefile.linux b/net/hawknl-devel/files/patch-src_makefile.linux
deleted file mode 100644
index 1b9dde86526b..000000000000
--- a/net/hawknl-devel/files/patch-src_makefile.linux
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/makefile.linux	Sun Mar  5 13:36:41 2006
-+++ src/makefile.linux	Sun Mar  5 13:38:06 2006
-@@ -1,19 +1,18 @@
--CC = gcc
-+CC? = ${CC}
- AR = ar cru
- RANLIB = ranlib
- MAJOR_VERSION = 1
- MINOR_VERSION = 7
- PATCH_LEVEL = 0
- VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)
--LIBDIR = /usr/local/lib
--INCDIR = /usr/local/include
-+LIBDIR = ${PREFIX}/lib
-+INCDIR = ${PREFIX}/include
- INCLUDE = -I../include
- OUTPUT = libNL.so.$(VERSION)
- LIBNAME = NL
- STATIC = libNL.a
--OPTFLAGS = -funroll-all-loops -ffast-math -fomit-frame-pointer -O2 -D_GNU_SOURCE -D_REENTRANT
--CFLAGS = -Wall -fPIC $(INCLUDE) $(OPTFLAGS)
--LIBFLAGS = -shared -Wl,-soname,NL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread
-+CFLAGS? = ${CFLAGS} -Wall -fPIC $(INCLUDE)
-+LIBFLAGS = -shared -Wl,-soname,NL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic ${LDFLAGS}
- OBJECTS = crc.o errorstr.o nl.o sock.o group.o loopback.o err.o hthread.o htmutex.o htcondition.o nltime.o
- 
- all: $(OBJECTS)
-@@ -38,20 +37,11 @@
- 	cp $(OUTPUT) $(LIBDIR)
- 	cp $(STATIC) $(LIBDIR)
- 	chmod 755 $(LIBDIR)/$(OUTPUT)
--	ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
- 	ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION)
- 	ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so
- 	ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/$(LIBNAME).so
- 	cp ../include/nl.h $(INCDIR)/nl.h
- 	chmod 644 $(INCDIR)/nl.h
--	@echo ""
--	@echo "*************************************************"
--	@echo "* Installed HawkNL.                             *"
--	@echo "* Remember to run /sbin/ldconfig before using   *"
--	@echo "* the library, you may also want to check that  *"
--	@echo "* $(LIBDIR) is included in /etc/ld.so.conf      *"
--	@echo "* You must be root to run ldconfig.             *"
--	@echo "*************************************************"
- 
- uninstall:
- 	rm -f $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
diff --git a/net/hawknl-devel/pkg-descr b/net/hawknl-devel/pkg-descr
deleted file mode 100644
index 09391b3c4001..000000000000
--- a/net/hawknl-devel/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-HawkNL is a free, open source, game oriented network API released under the GNU
-Library General Public License (LGPL). HawkNL (NL) is a fairly low level API, a
-wrapper over Berkeley/Unix Sockets and Winsock. 
-
-But NL also provides other features including support for many OSs, groups of 
-sockets, socket statistics, high accuracy timer, CRC functions, macros to read 
-and write data to packets with endian conversion, and support for multiple 
-network transports. 
-
-NL has been tested on Windows 9x/ME/NT/2000/XP/CE, Linux, Solaris, IRIX, AIX, 
-BSDs, Mac OSX. 
-
-WWW:	http://www.hawksoft.com/hawknl/
diff --git a/net/hawknl-devel/pkg-plist b/net/hawknl-devel/pkg-plist
deleted file mode 100644
index 72a76e70ac4d..000000000000
--- a/net/hawknl-devel/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-include/nl.h
-lib/libNL.a
-lib/libNL.so.1.7.0
-lib/libNL.so.1
-lib/libNL.so
-lib/NL.so
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/NLchanges.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/hawknl/Makefile b/net/hawknl/Makefile
deleted file mode 100644
index 4a512b467b0b..000000000000
--- a/net/hawknl/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-# $FreeBSD$
-
-PORTNAME=	hawknl
-PORTVERSION=	1.68
-CATEGORIES=	net devel
-MASTER_SITES=	http://www.hawksoft.com/download/files/
-DISTNAME=	HawkNL168src
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Portable networking library
-
-USES=		dos2unix gmake
-MAKEFILE=	makefile.linux
-USE_LDCONFIG=	yes
-
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CPPFLAGS+=	-I${LOCALBASE}/include
-
-WRKSRC=	${WRKDIR}/${PORTNAME}${PORTVERSION}
-
-OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CFLAGS+=	-fPIC -DPIC
-.endif
-
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-CFLAGS+=	-funroll-all-loops -ffast-math -fomit-frame-pointer -D_GNU_SOURCE -D_REENTRANT
-.endif
-
-post-patch:
-	${REINPLACE_CMD} -e 's|make -f|${MAKE_CMD} -f|g' ${WRKSRC}/${MAKEFILE}
-	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/nlinternal.h
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for FILE in readme.txt nlchanges.txt
-	${INSTALL_DATA} ${WRKSRC}/src/${FILE} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/hawknl/distinfo b/net/hawknl/distinfo
deleted file mode 100644
index ad99da84ab79..000000000000
--- a/net/hawknl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (hawknl/HawkNL168src.tar.gz) = 31a2883dbfe02937c9c862bb1aac0b89e465bbab822513c06bffa3f13e4c3c2e
-SIZE (hawknl/HawkNL168src.tar.gz) = 181263
diff --git a/net/hawknl/files/patch-src_makefile.linux b/net/hawknl/files/patch-src_makefile.linux
deleted file mode 100644
index bd7a29c87acb..000000000000
--- a/net/hawknl/files/patch-src_makefile.linux
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/makefile.linux	Sun Mar  5 03:46:18 2006
-+++ src/makefile.linux	Sun Mar  5 03:51:02 2006
-@@ -1,19 +1,18 @@
--CC = gcc
-+CC? = ${CC}
- AR = ar cru
- RANLIB = ranlib
- MAJOR_VERSION = 1
- MINOR_VERSION = 6
- PATCH_LEVEL = 8
- VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)
--LIBDIR = /usr/local/lib
--INCDIR = /usr/local/include
-+LIBDIR = ${PREFIX}/lib
-+INCDIR = ${PREFIX}/include
- INCLUDE = -I../include
- OUTPUT = libNL.so.$(VERSION)
- LIBNAME = NL
- STATIC = libNL.a
--OPTFLAGS = -funroll-all-loops -ffast-math -fomit-frame-pointer -O2 -D_GNU_SOURCE -D_REENTRANT
--CFLAGS = -Wall -fPIC $(INCLUDE) $(OPTFLAGS)
--LIBFLAGS = -shared -Wl,-soname,NL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread
-+CFLAGS? = ${CFLAGS} -Wall -fPIC $(INCLUDE)
-+LIBFLAGS = -shared -Wl,-soname,NL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic ${LDFLAGS}
- OBJECTS = crc.o errorstr.o nl.o sock.o group.o loopback.o err.o thread.o mutex.o condition.o nltime.o
- 
- all: $(OBJECTS)
-@@ -37,20 +36,11 @@
- 	cp $(OUTPUT) $(LIBDIR)
- 	cp $(STATIC) $(LIBDIR)
- 	chmod 755 $(LIBDIR)/$(OUTPUT)
--	ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
- 	ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION)
- 	ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so
- 	ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/$(LIBNAME).so
- 	cp ../include/nl.h $(INCDIR)/nl.h
- 	chmod 644 $(INCDIR)/nl.h
--	@echo ""
--	@echo "*************************************************"
--	@echo "* Installed HawkNL.                             *"
--	@echo "* Remember to run /sbin/ldconfig before using   *"
--	@echo "* the library, you may also want to check that  *"
--	@echo "* $(LIBDIR) is included in /etc/ld.so.conf      *"
--	@echo "* You must be root to run ldconfig.             *"
--	@echo "*************************************************"
- 
- uninstall:
- 	rm -f $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
diff --git a/net/hawknl/pkg-descr b/net/hawknl/pkg-descr
deleted file mode 100644
index 52b63de24c03..000000000000
--- a/net/hawknl/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-HawkNL is a free, open source, game oriented network API released under the GNU
-Library General Public License (LGPL). HawkNL (NL) is a fairly low level API, 
-a wrapper over Berkeley/Unix Sockets and Winsock. 
-
-But NL also provides other features including support for many OSs, groups of 
-sockets, socket statistics, high accuracy timer, CRC functions, macros to read
-and write data to packets with endian conversion, and support for multiple 
-network transports. 
-
-NL has been tested on Windows 9x/ME/NT/2000/XP/CE, Linux, Solaris, IRIX, AIX, 
-BSDs, Mac OSX. 
-
-WWW:	http://www.hawksoft.com/hawknl/
diff --git a/net/hawknl/pkg-plist b/net/hawknl/pkg-plist
deleted file mode 100644
index 3a19be533229..000000000000
--- a/net/hawknl/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-include/nl.h
-lib/libNL.a
-lib/libNL.so.1.6.8
-lib/libNL.so.1
-lib/libNL.so
-lib/NL.so
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/nlchanges.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/heybuddy/Makefile b/net/heybuddy/Makefile
deleted file mode 100644
index 2a35153ed6c8..000000000000
--- a/net/heybuddy/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# Created by: Beni Keller <navigium@grindcore.ch>
-# $FreeBSD$
-
-PORTNAME=	heybuddy
-PORTVERSION=	0.2.4
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	http://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ \
-		http://freebsd.grindcore.ch/distfiles/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Supposedly light, feature free identi.ca client
-
-LICENSE=	GPLv3
-
-USES=		tar:tgz
-USE_PYTHON=	yes
-USE_GNOME=	desktopfileutils pygtk2
-
-DESKTOP_ENTRIES=	"Heybuddy" \
-			"Light identi.ca client" \
-			"${PORTNAME}" \
-			"${PORTNAME}" \
-			"" \
-			false
-
-NO_STAGE=	yes
-
-OPTIONS_DEFINE=	NLS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} \
-		-e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%DATADIR%%|${DATADIR}|g' \
-		${WRKSRC}/${PORTNAME}.py
-	@${MV} ${WRKSRC}/${PORTNAME}.py ${WRKDIR}
-
-do-build:
-	${PYTHON_CMD} -mcompileall ${WRKSRC}
-	${PYTHON_CMD} -O -mcompileall ${WRKSRC}
-
-do-install:
-	@${MKDIR} ${DATADIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} README.txt *.py *.py[co] ${DATADIR}
-	cd ${WRKDIR} && ${INSTALL_SCRIPT} ${PORTNAME}.py ${PREFIX}/bin/${PORTNAME}
-	cd ${WRKSRC}/assets && ${INSTALL_DATA} icon64.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} assets ${DATADIR}
-.if ${PORT_OPTIONS:MNLS}
-	@cd ${WRKSRC}/locales && ${COPYTREE_SHARE} . ${PREFIX}/share/locale
-.endif
-
-post-install:
-	-@update-desktop-database
-
-.include <bsd.port.mk>
diff --git a/net/heybuddy/distinfo b/net/heybuddy/distinfo
deleted file mode 100644
index d401f20211d5..000000000000
--- a/net/heybuddy/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (heybuddy-0.2.4.tgz) = 233c4f3bc158240d57f6fc69c2810ca74de103d8c9d076a0f3e8eebd6b4330e2
-SIZE (heybuddy-0.2.4.tgz) = 84264
diff --git a/net/heybuddy/files/patch-heybuddy.py b/net/heybuddy/files/patch-heybuddy.py
deleted file mode 100644
index 66a2700a75c4..000000000000
--- a/net/heybuddy/files/patch-heybuddy.py
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./heybuddy.py.orig	2011-06-20 01:07:45.000000000 -0400
-+++ ./heybuddy.py	2011-10-24 07:19:38.000000000 -0400
-@@ -21,9 +21,9 @@
- import sys, os
- import gettext
- import webbrowser
--locale_dir = os.path.join(
--	os.path.dirname( os.path.realpath(__file__) ),
--	'locales')
-+locale_dir = '%%PREFIX%%/share/locale'
-+
-+sys.path.append('%%DATADIR%%')
- 
- gettext.bindtextdomain('heybuddy', locale_dir)
- gettext.textdomain('heybuddy')
-@@ -107,7 +107,7 @@
- 		self.last_get_statuses = 0
- 		#what are the assets?
- 		asset_dir = 'assets'
--		heybuddy_dir = os.path.dirname( os.path.realpath( __file__ ) )
-+		heybuddy_dir = '%%DATADIR%%'
- 		self.readme_file = os.path.join(heybuddy_dir,'README.txt')
- 		self.standard_icon_path = os.path.join(heybuddy_dir,asset_dir,'icon.png')
- 		self.direct_icon_path = os.path.join(heybuddy_dir,asset_dir,'direct_icon.png')
diff --git a/net/heybuddy/pkg-descr b/net/heybuddy/pkg-descr
deleted file mode 100644
index 72de3c166e77..000000000000
--- a/net/heybuddy/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Heybuddy is a supposedly light, feature free identi.ca client, 
-licensed under GNU GPL v3.
-
-WWW: http://www.jezra.net/projects/heybuddy
diff --git a/net/heybuddy/pkg-plist b/net/heybuddy/pkg-plist
deleted file mode 100644
index c42997f59535..000000000000
--- a/net/heybuddy/pkg-plist
+++ /dev/null
@@ -1,84 +0,0 @@
-bin/heybuddy
-%%DATADIR%%/About.py
-%%DATADIR%%/About.pyc
-%%DATADIR%%/About.pyo
-%%DATADIR%%/CertificateValidatingHTTPSHandler.py
-%%DATADIR%%/CertificateValidatingHTTPSHandler.pyc
-%%DATADIR%%/CertificateValidatingHTTPSHandler.pyo
-%%DATADIR%%/Communicator.py
-%%DATADIR%%/Communicator.pyc
-%%DATADIR%%/Communicator.pyo
-%%DATADIR%%/Configuration.py
-%%DATADIR%%/Configuration.pyc
-%%DATADIR%%/Configuration.pyo
-%%DATADIR%%/ContextPage.py
-%%DATADIR%%/ContextPage.pyc
-%%DATADIR%%/ContextPage.pyo
-%%DATADIR%%/Dent.py
-%%DATADIR%%/Dent.pyc
-%%DATADIR%%/Dent.pyo
-%%DATADIR%%/DentButton.py
-%%DATADIR%%/DentButton.pyc
-%%DATADIR%%/DentButton.pyo
-%%DATADIR%%/DentScroller.py
-%%DATADIR%%/DentScroller.pyc
-%%DATADIR%%/DentScroller.pyo
-%%DATADIR%%/FilterFrame.py
-%%DATADIR%%/FilterFrame.pyc
-%%DATADIR%%/FilterFrame.pyo
-%%DATADIR%%/GroupPage.py
-%%DATADIR%%/GroupPage.pyc
-%%DATADIR%%/GroupPage.pyo
-%%DATADIR%%/ImageCache.py
-%%DATADIR%%/ImageCache.pyc
-%%DATADIR%%/ImageCache.pyo
-%%DATADIR%%/MainWindow.py
-%%DATADIR%%/MainWindow.pyc
-%%DATADIR%%/MainWindow.pyo
-%%DATADIR%%/Notify.py
-%%DATADIR%%/Notify.pyc
-%%DATADIR%%/Notify.pyo
-%%DATADIR%%/PlatformSpecific.py
-%%DATADIR%%/PlatformSpecific.pyc
-%%DATADIR%%/PlatformSpecific.pyo
-%%DATADIR%%/README.txt
-%%DATADIR%%/ScrollPage.py
-%%DATADIR%%/ScrollPage.pyc
-%%DATADIR%%/ScrollPage.pyo
-%%DATADIR%%/SettingsPage.py
-%%DATADIR%%/SettingsPage.pyc
-%%DATADIR%%/SettingsPage.pyo
-%%DATADIR%%/StatusIcon.py
-%%DATADIR%%/StatusIcon.pyc
-%%DATADIR%%/StatusIcon.pyo
-%%DATADIR%%/TagPage.py
-%%DATADIR%%/TagPage.pyc
-%%DATADIR%%/TagPage.pyo
-%%DATADIR%%/UserPage.py
-%%DATADIR%%/UserPage.pyc
-%%DATADIR%%/UserPage.pyo
-%%DATADIR%%/XMLProcessor.py
-%%DATADIR%%/XMLProcessor.pyc
-%%DATADIR%%/XMLProcessor.pyo
-%%DATADIR%%/assets/direct_icon.png
-%%DATADIR%%/assets/icon.png
-%%DATADIR%%/assets/icon.svg
-%%DATADIR%%/assets/icon1.png
-%%DATADIR%%/assets/icon14.png
-%%DATADIR%%/assets/icon64.png
-%%DATADIR%%/assets/throbber.gif
-%%NLS%%share/locale/da/LC_MESSAGES/heybuddy.mo
-%%NLS%%share/locale/de/LC_MESSAGES/heybuddy.mo
-%%NLS%%share/locale/el/LC_MESSAGES/heybuddy.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/heybuddy.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/heybuddy.mo
-%%NLS%%share/locale/es/LC_MESSAGES/heybuddy.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/heybuddy.mo
-%%NLS%%share/locale/he/LC_MESSAGES/heybuddy.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/heybuddy.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/heybuddy.mo
-share/pixmaps/heybuddy.png
-@dirrm %%DATADIR%%/assets
-@dirrm %%DATADIR%%
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null 2>&1 || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null 2>&1 || /usr/bin/true
diff --git a/net/ipa_ipfw/Makefile b/net/ipa_ipfw/Makefile
deleted file mode 100644
index edb5f2f002ce..000000000000
--- a/net/ipa_ipfw/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by: Andrey Simonenko
-# $FreeBSD$
-
-PORTNAME=	ipa_ipfw
-PORTVERSION=	1.1
-CATEGORIES=	net
-MASTER_SITES=	SF/ipa-system/modules/ipa_ipfw
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	IPA accounting module for FreeBSD IP Firewall
-
-LICENSE=	BSD
-
-NO_PACKAGE=	Needs to be built uniquely for each host
-
-USES=	tar:bzip2
-USE_LDCONFIG=	yes
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-LOCALINCLUDE?=	${LOCALBASE}/include
-MAKE_ENV+=	DEBUG_FLAGS="" PREFIX=${PREFIX} LOCALINCLUDE=${LOCALINCLUDE}
-MAKE_ENV+=	NO_WCAST_ALIGN.clang=yes
-
-BUILD_DEPENDS+=	${LOCALBASE}/include/ipa_mod.h:${PORTSDIR}/sysutils/ipa
-
-PLIST_FILES=	lib/ipa_ipfw.so
-
-MANCOMPRESSED=	yes
-MAN8=		ipa_ipfw.8
-MANLANG=	"" ru.KOI8-R
-
-do-install:
-	cd ${WRKSRC} && ${MAKE} install
-	cd ${WRKSRC}/man && ${MAKE} LANG_DIR_SRC=ru.KOI8-R clean all install
-
-.include <bsd.port.post.mk>
diff --git a/net/ipa_ipfw/distinfo b/net/ipa_ipfw/distinfo
deleted file mode 100644
index 3f1ee185c68e..000000000000
--- a/net/ipa_ipfw/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ipa_ipfw-1.1.tar.bz2) = 50fd880b9b832fa305773c59fa040afb34e30d7960126f98d382acda9f5f2b16
-SIZE (ipa_ipfw-1.1.tar.bz2) = 16540
diff --git a/net/ipa_ipfw/pkg-descr b/net/ipa_ipfw/pkg-descr
deleted file mode 100644
index 4d84b62d46be..000000000000
--- a/net/ipa_ipfw/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-IPA_IPFW -- IPA accounting module for FreeBSD IP Firewall
-
-Main features:
-
-- The module is designed for traffic accounting from IP Firewall
-  (including IPFW2) rules byte counters;
-- The module understands IP Firewall rules byte counters overflow;
-- It is possible to summarize and subtract statistics of IP Firewall
-  rules byte counters;
-- It is possible to distinguish IP Firewall rules with the same numbers;
-- IP Firewall rules can be dynamically added to and deleted from
-  the system, the module correctly works in such situations.
-
-WWW: http://ipa-system.sourceforge.net/modules/ipa_ipfw/
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
deleted file mode 100644
index eeb62b46b624..000000000000
--- a/net/irrd/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# Created by: TAKANO Yuji <takano@net-chef.net>
-# $FreeBSD$
-
-PORTNAME=	irrd
-PORTVERSION=	2.3.10
-PORTREVISION=	1
-CATEGORIES=	net ipv6
-MASTER_SITES=	http://www.irrd.net/
-DISTNAME=	${PORTNAME}${PORTVERSION}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Internet Routing Registry database server
-
-WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/src
-
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
-
-MAN8=		irrd.8
-
-IRRD_CONFDIR=	${PREFIX}/etc
-
-USE_RC_SUBR=	irrd
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	YACC="${YACC}"
-MAKE_JOBS_UNSAFE=	yes
-#CONFIGURE_ARGS+=	--disable-thread
-
-.if defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--disable-ipv6
-.else
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
-NO_STAGE=	yes
-post-patch:
-	${REINPLACE_CMD} -e 's|/etc/irrd.conf|${IRRD_CONFDIR}/irrd.conf|g' \
-		${WRKSRC}/programs/IRRd/irrd.8	\
-		${WRKSRC}/programs/IRRd/main.c	\
-		${WRKSRC}/programs/irr_rpsl_submit/main.c	\
-		${WRKSRC}/programs/irr_notify/main.c	\
-		${WRKSRC}/programs/irr_rpsl_check/main.c	\
-		${WRKSRC}/programs/rps_dist/rpsdist.c	\
-		${WRKSRC}/programs/irrdcacher/irrdcacher	\
-		${WRKSRC}/programs/hdr_comm/read_conf.c
-
-post-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/programs/irrdcacher/irrdcacher    ${PREFIX}/sbin
-	@${INSTALL_SCRIPT} ${WRKSRC}/programs/irrdcacher/ripe2rpsl     ${PREFIX}/sbin
-	@${INSTALL_DATA}   ${WRKSRC}/../samples/irrd.conf.sample       ${IRRD_CONFDIR}
-	@${INSTALL_DATA}   ${WRKSRC}/programs/IRRd/irrd.8              ${PREFIX}/man/man8
-
-.include <bsd.port.mk>
diff --git a/net/irrd/distinfo b/net/irrd/distinfo
deleted file mode 100644
index 6130da0b3323..000000000000
--- a/net/irrd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (irrd2.3.10.tgz) = b3ebedc1a1a24a7a87519bdf6776fbda335deb454333b6d09f7bb9fabca35746
-SIZE (irrd2.3.10.tgz) = 772658
diff --git a/net/irrd/files/irrd.in b/net/irrd/files/irrd.in
deleted file mode 100644
index 96dee7541f2c..000000000000
--- a/net/irrd/files/irrd.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-# PROVIDE: irrd
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-# Define these irrd_* variables in one of these files:
-#	/etc/rc.conf
-#	/etc/rc.conf.local
-#	/etc/rc.conf.d/irrd
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-irrd_enable="${irrd_enable:-NO}"		# Enable irrd
-#irrd_program="%%PREFIX%%/sbin/irrd"		# Location of irrd
-irrd_flags="${irrd_flags:--u}"			# Flags to imapd program
-
-. /etc/rc.subr
-
-name="irrd"
-rcvar=irrd_enable
-command="%%PREFIX%%/sbin/irrd"
-required_files="%%PREFIX%%/etc/irrd.conf"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/net/irrd/files/patch-config_file.c b/net/irrd/files/patch-config_file.c
deleted file mode 100644
index 52723b198ac9..000000000000
--- a/net/irrd/files/patch-config_file.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/config/config_file.c.orig	2009-03-25 00:38:11.000000000 +0300
-+++ lib/config/config_file.c	2011-06-24 17:09:08.000000000 +0400
-@@ -772,7 +772,7 @@
- 	Deref_Prefix (prefix);
-         return (1);
-     }
--    if (prefix_compare2 (UII->prefix, prefix) != 0) {
-+    if ( UII->prefix == NULL || prefix_compare2 (UII->prefix, prefix) != 0) {
-     	set_uii (UII, UII_ADDR, prefix, 0);
- 	listen_uii2 (NULL);
-     }
diff --git a/net/irrd/files/patch-configure b/net/irrd/files/patch-configure
deleted file mode 100644
index c34662282724..000000000000
--- a/net/irrd/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2006-09-12 21:40:55.000000000 +0400
-+++ configure	2008-02-15 16:23:17.000000000 +0300
-@@ -6011,7 +6011,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <netinet/in.h>
-+#include <netinet6/in6.h>
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
diff --git a/net/irrd/files/patch-database.c b/net/irrd/files/patch-database.c
deleted file mode 100644
index fc32c929eb34..000000000000
--- a/net/irrd/files/patch-database.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- programs/IRRd/database.c~	2009-03-25 00:21:26.000000000 +0300
-+++ programs/IRRd/database.c	2012-03-15 10:53:03.000000000 +0400
-@@ -59,9 +59,11 @@
- 
-   db->radix_v4 = New_Radix (32);
-   db->radix_v6 = New_Radix (128);
--  fclose (db->db_fp);
- 
--  db->db_fp = NULL;
-+  if (db->db_fp) {
-+    fclose (db->db_fp);
-+    db->db_fp = NULL;
-+  }
- }
- 
- 
diff --git a/net/irrd/files/patch-lib_mrt_prefix.c b/net/irrd/files/patch-lib_mrt_prefix.c
deleted file mode 100644
index 28ef751dd7e9..000000000000
--- a/net/irrd/files/patch-lib_mrt_prefix.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: lib/mrt/prefix.c
-diff -u -p lib/mrt/prefix.c.orig lib/mrt/prefix.c
---- lib/mrt/prefix.c.orig	Fri Aug 31 03:10:31 2001
-+++ lib/mrt/prefix.c	Mon May  1 12:05:11 2006
-@@ -15,7 +15,7 @@
- #include <ws2tcpip.h>
- #endif /* NT */
- 
--#ifndef __GLIBC__
-+#if !defined(__GLIBC__) && !defined(__FreeBSD__)
- #ifdef __osf__
- 
- /* apparently, OSF's gethostby{name,addr}_r's are different, broken, and
-@@ -50,7 +50,7 @@ struct hostent  *gethostbyaddr_r
-       For the time being, this part tries to convert Linux glibc 2.X
-       gethostXX_r into Solaris's that we use to code MRT. -- masaki
-     */
--#if __GLIBC__ >= 2
-+#if __GLIBC__ >= 2 || (defined(__FreeBSD__) && defined(HAVE_GETHOSTBYNAME_R))
-    /* Glibc 2.X
- 
-     int gethostbyname_r (const char *name, struct hostent *result_buf, 
diff --git a/net/irrd/files/patch-uii_commands.c b/net/irrd/files/patch-uii_commands.c
deleted file mode 100644
index 9f1dbfe8b986..000000000000
--- a/net/irrd/files/patch-uii_commands.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- programs/IRRd/uii_commands.c.orig	Tue Feb  5 05:53:57 2002
-+++ programs/IRRd/uii_commands.c	Thu Apr 22 18:13:29 2004
-@@ -14,6 +14,8 @@
- #include <ctype.h>
- #include "irrd.h"
- 
-+#include <errno.h>
-+
- #include <fcntl.h>
- #ifndef SETPGRP_VOID
- #endif
-@@ -720,6 +722,10 @@
- 
- void run_cmd (char *cmd, FILE **in, FILE **out) {
-   int pin[2], pout[2];
-+  int pid;
-+  int omask, pstat;
-+  pid_t ppid;
-+  extern int errno;
- 
-   if (in != NULL)
-     *in = NULL;
-@@ -733,7 +739,9 @@
-   if (out != NULL)
-     pipe (pout);
-   
--  if (fork() == 0) { /* We're the child */
-+/*  if (fork() == 0) { */
-+  pid = fork();
-+  if (pid == 0) { /* We're the child */
-     if (in != NULL) {
-       close (pin[1]);
-       dup2  (pin[0], 0);
-@@ -747,7 +755,7 @@
-       close (pout[1]);
-     }
-     
--    execl("/bin/sh", "sh", "-c", cmd, NULL);
-+    execlp("/bin/sh", "sh", "-c", cmd, NULL);
-     _exit(127);
-   }
- 
-@@ -761,6 +769,12 @@
-     close (pin[0]);
-     *in = fdopen (pin[1], "w");
-   }
-+
-+  omask = sigblock(sigmask(SIGINT)|sigmask(SIGQUIT)|sigmask(SIGHUP));
-+  do {
-+    ppid = waitpid(pid, (int *) &pstat, 0);
-+  } while (pid == -1 && errno == EINTR);
-+  (void)sigsetmask(omask);
- }
- 
- int kill_irrd (uii_connection_t *uii) {
diff --git a/net/irrd/pkg-descr b/net/irrd/pkg-descr
deleted file mode 100644
index fbadf223c414..000000000000
--- a/net/irrd/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Internet Routing Registry Daemon (IRRd).
-
-WWW: http://www.irrd.net/
diff --git a/net/irrd/pkg-plist b/net/irrd/pkg-plist
deleted file mode 100644
index 717e21a999bd..000000000000
--- a/net/irrd/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-sbin/irrd
-sbin/irr_rpsl_check
-sbin/irr_rpsl_submit
-sbin/irr_notify
-sbin/irrdcacher
-sbin/ripe2rpsl
-etc/irrd.conf.sample
diff --git a/net/iscsi-target/Makefile b/net/iscsi-target/Makefile
deleted file mode 100644
index 7d67d39a99d6..000000000000
--- a/net/iscsi-target/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# Created by: Frederic Senault <fred@lacave.net>
-# $FreeBSD$
-
-PORTNAME=	iscsi
-PORTVERSION=	20080207
-PORTREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ \
-		http://www.magnesium.net/~mdf/distfiles/
-PKGNAMESUFFIX=	-target
-DISTNAME=	netbsd-iscsi-${PORTVERSION}
-
-MAINTAINER=	mark@foster.cc
-COMMENT=	Implementation of userland ISCSI target (from NetBSD)
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-DEPRECATED=	Use net/istgt or base systems ctld(8) on 10.x instead
-GNU_CONFIGURE=	yes
-
-MAN5=		targets.5
-MAN8=		iscsi-target.8
-
-USE_RC_SUBR=	iscsi_target
-
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|_LDFLAGS= -pthread|_LDFLAGS= ${PTHREAD_CFLAGS}|' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|_FLAGS= -pthread|_FLAGS= ${PTHREAD_CFLAGS}|' ${WRKSRC}/Makefile.in
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/iscsi-target ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/etc/iscsi
-.for i in targets passwd auths
-	${INSTALL_DATA} ${WRKSRC}/etc/$i ${PREFIX}/etc/iscsi/$i.sample
-.endfor
-	${INSTALL_MAN} ${WRKSRC}/targets.5 ${PREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/iscsi-target.8 ${PREFIX}/man/man8
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in FAQ README README_OSD PERFORMANCE license
-	${INSTALL_MAN} ${WRKSRC}/../doc/$i ${DOCSDIR}
-.endfor
-.endif
-.for i in targets passwd auths
-	if [ ! -f ${PREFIX}/etc/iscsi/$i ]; then \
-		${CP} -p ${PREFIX}/etc/iscsi/$i.sample ${PREFIX}/etc/iscsi/$i ; \
-	fi
-.endfor
-
-.include <bsd.port.mk>
diff --git a/net/iscsi-target/distinfo b/net/iscsi-target/distinfo
deleted file mode 100644
index 3fe4162b9c93..000000000000
--- a/net/iscsi-target/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (netbsd-iscsi-20080207.tar.gz) = 9c6e7372c94b5ccbc33e299030d19fd8c24ccea24ffbffaa94d42551a76ae284
-SIZE (netbsd-iscsi-20080207.tar.gz) = 249607
diff --git a/net/iscsi-target/files/iscsi_target.in b/net/iscsi-target/files/iscsi_target.in
deleted file mode 100644
index fa7a64bc6671..000000000000
--- a/net/iscsi-target/files/iscsi_target.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: iscsi_target
-# REQUIRE: NETWORKING mountall quota
-
-. /etc/rc.subr
-
-name="iscsi_target"
-rcvar=iscsi_target_enable
-
-command="%%PREFIX%%/bin/iscsi-target"
-required_files="%%PREFIX%%/etc/iscsi/targets"
-pidfile="/var/run/iscsi-target.pid"
-
-load_rc_config $name
-
-: ${iscsi_target_enable="NO"}
-: ${iscsi_target_config="%%PREFIX%%/etc/iscsi/targets"}
-
-command_args="-f $iscsi_target_config"
-
-run_rc_command "$1"
diff --git a/net/iscsi-target/files/patch-iscsiutil b/net/iscsi-target/files/patch-iscsiutil
deleted file mode 100644
index 05cc0e961104..000000000000
--- a/net/iscsi-target/files/patch-iscsiutil
+++ /dev/null
@@ -1,23 +0,0 @@
---- ../include/iscsiutil.h	2007-11-12 15:25:40.000000000 -0800
-+++ ../include/iscsiutil.h	2008-04-18 21:31:18.000000000 -0700
-@@ -77,16 +77,20 @@
- #define ISCSI_HTONLL6(x) (uint64_t) \
-       ( ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000ff0000000000uLL) >> 40))     \
-       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x000000ff00000000uLL) >> 24))     \
-+      | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0xffffffffffff0000uLL) >> 16))     \
-       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x00000000ff000000uLL) >> 8))      \
-       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000000000ff0000uLL) << 8))      \
-+      | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000ffffffffffffuLL) << 16))     \
-       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x000000000000ff00uLL) << 24))     \
-       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x00000000000000ffuLL) << 40)))
- 
- #define ISCSI_NTOHLL6(x) (uint64_t) \
-       ( ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000ff0000000000uLL) >> 40))     \
-       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x000000ff00000000uLL) >> 24))     \
-+      | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0xffffffffffff0000uLL) >> 16))     \
-       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x00000000ff000000uLL) >> 8))      \
-       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000000000ff0000uLL) << 8))      \
-+      | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000ffffffffffffuLL) << 16))     \
-       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x000000000000ff00uLL) << 24))     \
-       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x00000000000000ffuLL) << 40)))
- 
diff --git a/net/iscsi-target/files/patch-src-Makefile.in b/net/iscsi-target/files/patch-src-Makefile.in
deleted file mode 100644
index d3af6e1617e6..000000000000
--- a/net/iscsi-target/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2008-02-07 17:25:13.000000000 +0800
-+++ Makefile.in	2008-03-16 17:16:12.000000000 +0800
-@@ -20,7 +20,7 @@
- PTHREAD_LDFLAGS= -pthread
- PTHREAD_LIBS= -lpthread
- GCC_CFLAGS= -Wall -Wstrict-prototypes -fno-strict-aliasing -fno-common -Wno-trigraphs
--COMMON_CFLAGS += -DCONFIG_ISCSI_DEBUG -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-+COMMON_CFLAGS += -DCONFIG_ISCSI_DEBUG -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DSYSCONFDIR=\"${SYSCONFDIR}\"
- COMMON_CFLAGS += -DHAVE_CONFIG_H
- COMMON_CFLAGS += -I${INCDIR}
- CFLAGS= @CFLAGS@ ${GCC_CFLAGS} ${COMMON_CFLAGS} -I${INCLUDE} ${PTHREAD_FLAGS}
diff --git a/net/iscsi-target/pkg-descr b/net/iscsi-target/pkg-descr
deleted file mode 100644
index ad620b425102..000000000000
--- a/net/iscsi-target/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is an implementation of iSCSI target, the server-side of ISCSI protocol,
-used to service remote iSCSI requests.
-
-WWW: http://www.netbsd.org/
diff --git a/net/iscsi-target/pkg-message b/net/iscsi-target/pkg-message
deleted file mode 100644
index 688a30069ebb..000000000000
--- a/net/iscsi-target/pkg-message
+++ /dev/null
@@ -1,3 +0,0 @@
-To run iscsi-target server from startup, add iscsi_target_enable="YES"
-to /etc/rc.conf. Extra options can be found in startup script.
-
diff --git a/net/iscsi-target/pkg-plist b/net/iscsi-target/pkg-plist
deleted file mode 100644
index ba51483ddc32..000000000000
--- a/net/iscsi-target/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-bin/iscsi-target
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/PERFORMANCE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README_OSD
-%%PORTDOCS%%%%DOCSDIR%%/license
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec if cmp -s %D/etc/iscsi/targets.sample %D/etc/iscsi/targets; then rm -f %D/etc/iscsi/targets; fi
-etc/iscsi/targets.sample
-@exec if [ ! -f %D/etc/iscsi/targets ] ; then cp -p %D/%F %B/targets; fi
-@unexec if cmp -s %D/etc/iscsi/auths.sample   %D/etc/iscsi/auths;   then rm -f %D/etc/iscsi/auths;   fi
-etc/iscsi/auths.sample
-@exec if [ ! -f %D/etc/iscsi/auths   ] ; then cp -p %D/%F %B/auths;   fi
-@unexec if cmp -s %D/etc/iscsi/passwd.sample  %D/etc/iscsi/passwd;  then rm -f %D/etc/iscsi/passwd;  fi
-etc/iscsi/passwd.sample
-@exec if [ ! -f %D/etc/iscsi/passwd  ] ; then cp -p %D/%F %B/passwd;  fi
-@dirrm etc/iscsi
diff --git a/net/kojoney/Makefile b/net/kojoney/Makefile
deleted file mode 100644
index c7c03978cf79..000000000000
--- a/net/kojoney/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: mj <systemoperator@gmail.com>
-# $FreeBSD$
-
-PORTNAME=	kojoney
-PORTVERSION=	0.0.4.2
-CATEGORIES=	net
-MASTER_SITES=	SF/${PORTNAME}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Low level interaction honeypot that emulates an SSH server
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0_1:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHONPREFIX_SITELIBDIR}/Crypto:${PORTSDIR}/security/py-pycrypto \
-		p5-IP-Country>=0:${PORTSDIR}/net/p5-IP-Country
-
-WRKSRC=		${WRKDIR}/kojoney
-
-USE_PYTHON=	yes
-USE_OPENSSL=	yes
-USES=		perl5 twisted:conch
-USE_PERL5=	run
-
-NO_STAGE=	yes
-.include <bsd.port.mk>
diff --git a/net/kojoney/distinfo b/net/kojoney/distinfo
deleted file mode 100644
index 040dc9d4f972..000000000000
--- a/net/kojoney/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (kojoney-0.0.4.2.tar.gz) = 1adb444fd743e18a4f7a6e8fa380559ace97aba405d0d5ca6a0dc610879fda8b
-SIZE (kojoney-0.0.4.2.tar.gz) = 3201050
diff --git a/net/kojoney/files/patch-Makefile b/net/kojoney/files/patch-Makefile
deleted file mode 100644
index 56aa7e360cb1..000000000000
--- a/net/kojoney/files/patch-Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.old       Tue Dec  5 15:12:55 2006
-+++ Makefile    Tue Dec  5 15:11:49 2006
-@@ -0,0 +1,16 @@
-+all:
-+	@echo ""
-+	@echo ""
-+	@echo "There's nothing to do. Just use 'make install'."
-+	@echo ""
-+install:
-+	@mkdir -p ${PREFIX}/kojoney/reports
-+	@mv coret_config.py coret_config.py.dist
-+	@cp -pf coret_config.py.dist ${PREFIX}/kojoney
-+	@cp -pf *.py ${PREFIX}/kojoney
-+	@cp -pf KoJoney.e3p ${PREFIX}/kojoney
-+	@mv fake_users fake_users.dist
-+	@cp -pf fake_users.dist ${PREFIX}/kojoney
-+	@cp -pf reports/k* ${PREFIX}/kojoney/reports
-+	@mv coret_config.py.dist coret_config.py
-+	@mv fake_users.dist fake_users
diff --git a/net/kojoney/pkg-descr b/net/kojoney/pkg-descr
deleted file mode 100644
index 6276cae07912..000000000000
--- a/net/kojoney/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Kojoney is a low level interaction honeypot that emulates an SSH server.
-The daemon is written in Python using the Twisted Conch libraries.
-
-WWW: http://kojoney.sourceforge.net/
diff --git a/net/kojoney/pkg-plist b/net/kojoney/pkg-plist
deleted file mode 100644
index dad866712d3e..000000000000
--- a/net/kojoney/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-kojoney/KoJoney.e3p
-kojoney/coret_command.py
-kojoney/coret_config.py.dist
-kojoney/coret_fake.py
-kojoney/coret_honey.py
-kojoney/coret_log.py
-kojoney/coret_std_unix.py
-kojoney/coret_users.py
-kojoney/fake_users.dist
-kojoney/kojoney.py
-kojoney/reports/kojhumans
-kojoney/reports/kojreport-filter
-kojoney/reports/kip2country
-kojoney/reports/kojreport
-kojoney/reports/kojsession
-@dirrmtry kojoney/reports
-@dirrmtry kojoney
diff --git a/net/libtcp4u/Makefile b/net/libtcp4u/Makefile
deleted file mode 100644
index 16487eb5a83a..000000000000
--- a/net/libtcp4u/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Created by: Juraj Lutter <otis@sk.freebsd.org>
-# $FreeBSD$
-
-PORTNAME=	libtcp4u
-PORTVERSION=	3.3.1
-CATEGORIES=	net devel
-MASTER_SITES=	http://membres.lycos.fr/phjounin/zip/ \
-		ftp://ftp.wilbury.sk/pub/FreeBSD/local/distfiles/
-DISTNAME=	tcp4u331
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	TCP interface library
-
-LICENSE=	GPLv2
-
-WRKSRC=		${WRKDIR}/tcp4u.331/src
-PATCH_WRKSRC=	${WRKDIR}/tcp4u.331
-
-USES=		zip
-
-PLIST_FILES=	include/udp4u.h include/tcp4u.h \
-		include/smtp4u.h include/http4u.h \
-		lib/libtcp4ux.a
-
-NO_STAGE=	yes
-do-configure:
-	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/../Unix/Makefile
-	${CP} ${WRKSRC}/../Unix/Makefile ${WRKSRC}
-
-.include <bsd.port.mk>
diff --git a/net/libtcp4u/distinfo b/net/libtcp4u/distinfo
deleted file mode 100644
index c54c882d92c7..000000000000
--- a/net/libtcp4u/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (tcp4u331.zip) = 61b81dc32bed5ab4484f33847da3722d1507a4a3acbd344db2c9962c46e2684b
-SIZE (tcp4u331.zip) = 243862
diff --git a/net/libtcp4u/files/patch-Unix__Makefile b/net/libtcp4u/files/patch-Unix__Makefile
deleted file mode 100644
index 1754b721ed7b..000000000000
--- a/net/libtcp4u/files/patch-Unix__Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
---- Unix/Makefile.orig	Tue Mar 24 12:13:02 1998
-+++ Unix/Makefile	Sat Dec  1 10:53:00 2001
-@@ -9,15 +9,18 @@
- # Use : 
- #     make install
- 
--DESTDIR      = ../Unix/
--COMPIL_FLAGS = -g
-+PREFIX			= %%PREFIX%%
-+DESTDIRLIB		= %%PREFIX%%/lib
-+DESTDIRINC		= %%PREFIX%%/include
-+
-+COMPIL_FLAGS = -O2
- 
- 
- # SunOS: AR should be declared as ar r
- AR      = ar -r
- # AR      = ar r
- 
--INSTALL = cp -p
-+INSTALL = cp -pR
- RM      = rm -f
- 
- 
-@@ -51,9 +54,10 @@
- 	ranlib $@
- 
- install:: $(TEST_DIRECTORY) lib$(LIB_NAME).a
--	@if [ -d $(DESTDIR) ]; then set +x; \
--		else (set -x; $(MKDIRHIER) $(DESTDIR) $(DESTDIR)); fi
--	$(INSTALL) $(INSTLIBFLAGS) lib$(LIB_NAME).a $(DESTDIR) 
-+	@if [ -d $(DESTDIRLIB) ]; then set +x; \
-+		else (set -x; $(MKDIRHIER) $(DESTDIRLIB) $(DESTDIRLIB)); fi
-+	$(INSTALL) $(INSTLIBFLAGS) lib$(LIB_NAME).a $(DESTDIRLIB) 
-+	$(INSTALL) $(TCP4U_INC)/*4u.h $(DESTDIRINC)
- 
- test_directory: 
- 	@if [ ! -r tcp4u.c ]; then \
diff --git a/net/libtcp4u/pkg-descr b/net/libtcp4u/pkg-descr
deleted file mode 100644
index 2b595eb148bf..000000000000
--- a/net/libtcp4u/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Library for easy writing socket-oriented applications.
-Supports TCP and UDP protocols as well as some higher
-level protocols (HTTP, SMTP).
-Conctains tcp4u, http4u, tn4u, udp4u.
-
-WWW: http://membres.tripod.fr/phjounin/
diff --git a/net/mediaproxy/Makefile b/net/mediaproxy/Makefile
deleted file mode 100644
index 1ff7fe40d189..000000000000
--- a/net/mediaproxy/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by: Steve Ames <steve@energistic.com>
-# $FreeBSD$
-
-PORTNAME=	mediaproxy
-PORTVERSION=	1.8.2
-PORTREVISION=	4
-CATEGORIES=	net
-MASTER_SITES=	http://mediaproxy.ag-projects.com/ \
-		http://mediaproxy.ag-projects.com/old/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Far-end NAT traversal solution for SER/OpenSER
-
-USE_RC_SUBR=	mediaproxy proxydispatcher
-
-USE_PYTHON=	yes
-
-SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
-
-OPTIONS_DEFINE=	ACCOUNTING
-ACCOUNTING_DESC=	ACCOUNTING support (Requires MySQL)
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MACCOUNTING}
-USE_MYSQL=	yes
-.endif
-
-post-extract:
-	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
-
-post-install:
-	${CP} -pRP ${WRKSRC}/ ${PREFIX}/mediaproxy
-	${CHOWN} -R 0:0 ${PREFIX}/mediaproxy
-
-.include <bsd.port.post.mk>
diff --git a/net/mediaproxy/distinfo b/net/mediaproxy/distinfo
deleted file mode 100644
index 618dd92616f4..000000000000
--- a/net/mediaproxy/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mediaproxy-1.8.2.tar.gz) = c7c8c1e6fe51af6ac03cf54545760677514c3de23e5338e70fc11235cc5c37d1
-SIZE (mediaproxy-1.8.2.tar.gz) = 1562639
diff --git a/net/mediaproxy/files/mediaproxy.in b/net/mediaproxy/files/mediaproxy.in
deleted file mode 100644
index 77aa1f0e469c..000000000000
--- a/net/mediaproxy/files/mediaproxy.in
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# PROVIDE: mediaproxy
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# mediaproxy   starts and stops the SER MediaProxy server
-#
-# Add the following line to /etc/rc.conf to enable mediaproxy:
-# mediaproxy_enable (bool):	Set to "NO" by default.
-#				Set it to "YES" to enable mediaproxy.
-#
-# mediaproxy_flags (string):	Set command line options
-
-. /etc/rc.subr
-
-name="mediaproxy"
-rcvar=mediaproxy_enable
-
-load_rc_config $name
-
-: ${mediaproxy_enable="NO"}
-
-pidfile="/var/run/${name}.pid"
-
-command="%%PREFIX%%/mediaproxy/mediaproxy.py"
-command_interpreter="%%PYTHON_CMD%%"
-command_args="--pid $pidfile"
-
-start_postcmd="%%PREFIX%%/etc/rc.d/proxydispatcher onestart"
-stop_postcmd="%%PREFIX%%/etc/rc.d/proxydispatcher stop"
-
-run_rc_command "$1"
diff --git a/net/mediaproxy/files/patch-Makefile b/net/mediaproxy/files/patch-Makefile
deleted file mode 100644
index b2a3aa944105..000000000000
--- a/net/mediaproxy/files/patch-Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- Makefile     Wed Dec 31 19:00:00 1969
-+++ Makefile Tue Aug  8 15:01:10 2006
-@@ -0,0 +1,4 @@
-+all:
-+
-+install:
-+
-
diff --git a/net/mediaproxy/files/proxydispatcher.in b/net/mediaproxy/files/proxydispatcher.in
deleted file mode 100644
index 2b0b466d1c39..000000000000
--- a/net/mediaproxy/files/proxydispatcher.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# PROVIDE: proxydispatcher
-# REQUIRE: mediaproxy
-# KEYWORD: nostart
-#
-# proxydispatcher   starts and stops the SER MediaProxy dispatcher
-#
-# This script is usually run by %%PREFIX%%/etc/rc.d/mediaproxy
-#
-# Add the following line to /etc/rc.conf to enable proxydispatcher:
-# proxydispatcher_enable (bool):	Set to "NO" by default.
-#					Set it to "YES" to enable dispatcher.
-# proxydispatcher_flags (string):	Set command line options
-
-. /etc/rc.subr
-
-name="proxydispatcher"
-rcvar=proxydispatcher_enable
-
-load_rc_config $name
-
-: ${proxydispatcher_enable="NO"}
-
-pidfile="/var/run/${name}.pid"
-
-command="%%PREFIX%%/mediaproxy/proxydispatcher.py"
-command_interpreter="%%PYTHON_CMD%%"
-command_args="--pid $pidfile"
-
-run_rc_command "$1"
diff --git a/net/mediaproxy/pkg-descr b/net/mediaproxy/pkg-descr
deleted file mode 100644
index d2b255843228..000000000000
--- a/net/mediaproxy/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-MediaProxy is a far-end NAT traversal solution for OpenSER
-and SIP Express Router that has the following features:
-
-  - Distributed geographical location
-  - Scalability, load balancing and redundancy
-  - Real-time sessions statistics
-  - Configurable IP and UDP port range
-  - Support for audio and video streams
-  - Support for multiple media streams per call
-  - Accounting of network traffic
-
-WWW: http://mediaproxy.ag-projects.com/
diff --git a/net/mediaproxy/pkg-plist b/net/mediaproxy/pkg-plist
deleted file mode 100644
index c9ebbdc88a45..000000000000
--- a/net/mediaproxy/pkg-plist
+++ /dev/null
@@ -1,212 +0,0 @@
-mediaproxy/Changelog
-mediaproxy/INSTALL
-mediaproxy/LICENSE
-mediaproxy/Makefile
-mediaproxy/Makefile.orig
-mediaproxy/NATtraversal-BestPractices.pdf
-mediaproxy/README
-mediaproxy/boot/macosx/MEDIAPROXY/MEDIAPROXY
-mediaproxy/boot/macosx/MEDIAPROXY/StartupParameters.plist
-mediaproxy/boot/macosx/README
-mediaproxy/boot/mediaproxy.debian
-mediaproxy/boot/mediaproxy.other
-mediaproxy/cdrtool_5.0.tar.gz
-mediaproxy/dictionary
-mediaproxy/geodistribution.txt
-mediaproxy/mediaproxy.ini.sample
-mediaproxy/mediaproxy.py
-mediaproxy/modules/accounting.py
-mediaproxy/modules/configuration.py
-mediaproxy/modules/daemon.py
-mediaproxy/modules/datatypes.py
-mediaproxy/modules/dispatcher.py
-mediaproxy/modules/external/DNS/Base.py
-mediaproxy/modules/external/DNS/Class.py
-mediaproxy/modules/external/DNS/Lib.py
-mediaproxy/modules/external/DNS/Opcode.py
-mediaproxy/modules/external/DNS/Status.py
-mediaproxy/modules/external/DNS/Type.py
-mediaproxy/modules/external/DNS/__init__.py
-mediaproxy/modules/external/DNS/lazy.py
-mediaproxy/modules/external/timeoutsocket.py
-mediaproxy/modules/formatting.py
-mediaproxy/modules/mysql.py
-mediaproxy/modules/options.py
-mediaproxy/modules/radius.py
-mediaproxy/modules/request.py
-mediaproxy/modules/rtphandler.py
-mediaproxy/modules/serialize.py
-mediaproxy/modules/utilities.py
-mediaproxy/modules/version.py
-mediaproxy/proxydispatcher.py
-mediaproxy/sessions.py
-mediaproxy/utils/fakeconversations.py
-mediaproxy/utils/rtpgenerator.py
-mediaproxy/web/config/media_servers.php.sample
-mediaproxy/web/config/phone_images.php
-mediaproxy/web/images/30/aastra.png
-mediaproxy/web/images/30/asterisk.png
-mediaproxy/web/images/30/audiocodes-mp124.png
-mediaproxy/web/images/30/avm-fritzbox-wlan.png
-mediaproxy/web/images/30/avm-fritzbox-wlan2.png
-mediaproxy/web/images/30/budgetone100.png
-mediaproxy/web/images/30/cirpack.png
-mediaproxy/web/images/30/cisco-5380.png
-mediaproxy/web/images/30/cisco-7960.png
-mediaproxy/web/images/30/cisco-ata.png
-mediaproxy/web/images/30/cisco.png
-mediaproxy/web/images/30/copperjet16162p.png
-mediaproxy/web/images/30/draytek-vigor2600v.png
-mediaproxy/web/images/30/draytek-vigor2600vg.png
-mediaproxy/web/images/30/draytek-vigor2800g.png
-mediaproxy/web/images/30/draytek-vigor2900g.png
-mediaproxy/web/images/30/eStara.png
-mediaproxy/web/images/30/ekiga.png
-mediaproxy/web/images/30/eyebeam.png
-mediaproxy/web/images/30/handytone.png
-mediaproxy/web/images/30/hitachi-wip5000-2.png
-mediaproxy/web/images/30/hitachi-wip5000-3.png
-mediaproxy/web/images/30/hitachi-wip5000.png
-mediaproxy/web/images/30/innomedia-mta5000.png
-mediaproxy/web/images/30/ipDialog.png
-mediaproxy/web/images/30/linksys-pap2-vert.png
-mediaproxy/web/images/30/linksys-pap2.png
-mediaproxy/web/images/30/messenger.png
-mediaproxy/web/images/30/nokia.png
-mediaproxy/web/images/30/session.png
-mediaproxy/web/images/30/siemens-3610.png
-mediaproxy/web/images/30/sipps.png
-mediaproxy/web/images/30/sjphone.png
-mediaproxy/web/images/30/snom100.png
-mediaproxy/web/images/30/snom200.png
-mediaproxy/web/images/30/snom320-front.png
-mediaproxy/web/images/30/snom320-left.png
-mediaproxy/web/images/30/snom320.png
-mediaproxy/web/images/30/snom360-front.png
-mediaproxy/web/images/30/snom360-left.png
-mediaproxy/web/images/30/snom360.png
-mediaproxy/web/images/30/spa2000.png
-mediaproxy/web/images/30/unknown.png
-mediaproxy/web/images/30/unknown3.png
-mediaproxy/web/images/30/vizufon.png
-mediaproxy/web/images/30/vizufon2.png
-mediaproxy/web/images/30/webstarepx2203.png
-mediaproxy/web/images/30/xten.png
-mediaproxy/web/images/30/zoep.png
-mediaproxy/web/images/30/zyxel-p2000.png
-mediaproxy/web/images/35/aastra.png
-mediaproxy/web/images/35/asterisk.png
-mediaproxy/web/images/35/audiocodes-mp124.png
-mediaproxy/web/images/35/avm-fritzbox-wlan.png
-mediaproxy/web/images/35/avm-fritzbox-wlan2.png
-mediaproxy/web/images/35/budgetone100.png
-mediaproxy/web/images/35/cirpack.png
-mediaproxy/web/images/35/cisco-5380.png
-mediaproxy/web/images/35/cisco-7960.png
-mediaproxy/web/images/35/cisco-ata.png
-mediaproxy/web/images/35/cisco.png
-mediaproxy/web/images/35/copperjet16162p.png
-mediaproxy/web/images/35/draytek-vigor2600v.png
-mediaproxy/web/images/35/draytek-vigor2600vg.png
-mediaproxy/web/images/35/draytek-vigor2800g.png
-mediaproxy/web/images/35/draytek-vigor2900g.png
-mediaproxy/web/images/35/eStara.png
-mediaproxy/web/images/35/ekiga.png
-mediaproxy/web/images/35/eyebeam.png
-mediaproxy/web/images/35/handytone.png
-mediaproxy/web/images/35/hitachi-wip5000-2.png
-mediaproxy/web/images/35/hitachi-wip5000-3.png
-mediaproxy/web/images/35/hitachi-wip5000.png
-mediaproxy/web/images/35/innomedia-mta5000.png
-mediaproxy/web/images/35/ipDialog.png
-mediaproxy/web/images/35/linksys-pap2-vert.png
-mediaproxy/web/images/35/linksys-pap2.png
-mediaproxy/web/images/35/messenger.png
-mediaproxy/web/images/35/nokia.png
-mediaproxy/web/images/35/session.png
-mediaproxy/web/images/35/siemens-3610.png
-mediaproxy/web/images/35/sipps.png
-mediaproxy/web/images/35/sjphone.png
-mediaproxy/web/images/35/snom100.png
-mediaproxy/web/images/35/snom200.png
-mediaproxy/web/images/35/snom320-front.png
-mediaproxy/web/images/35/snom320-left.png
-mediaproxy/web/images/35/snom320.png
-mediaproxy/web/images/35/snom360-front.png
-mediaproxy/web/images/35/snom360-left.png
-mediaproxy/web/images/35/snom360.png
-mediaproxy/web/images/35/spa2000.png
-mediaproxy/web/images/35/unknown.png
-mediaproxy/web/images/35/unknown3.png
-mediaproxy/web/images/35/vizufon.png
-mediaproxy/web/images/35/vizufon2.png
-mediaproxy/web/images/35/webstarexp2203.png
-mediaproxy/web/images/35/xten.png
-mediaproxy/web/images/35/zoep.png
-mediaproxy/web/images/35/zyxel-p2000.png
-mediaproxy/web/images/40/aastra.png
-mediaproxy/web/images/40/asterisk.png
-mediaproxy/web/images/40/audiocodes-mp124.png
-mediaproxy/web/images/40/avm-fritzbox-wlan.png
-mediaproxy/web/images/40/avm-fritzbox-wlan2.png
-mediaproxy/web/images/40/budgetone100.png
-mediaproxy/web/images/40/cirpack.png
-mediaproxy/web/images/40/cisco-5380.png
-mediaproxy/web/images/40/cisco-7960.png
-mediaproxy/web/images/40/cisco-ata.png
-mediaproxy/web/images/40/cisco.png
-mediaproxy/web/images/40/copperjet16162p.png
-mediaproxy/web/images/40/draytek-vigor2600v.png
-mediaproxy/web/images/40/draytek-vigor2600vg.png
-mediaproxy/web/images/40/draytek-vigor2800g.png
-mediaproxy/web/images/40/draytek-vigor2900g.png
-mediaproxy/web/images/40/eStara.png
-mediaproxy/web/images/40/ekiga.png
-mediaproxy/web/images/40/eyebeam.png
-mediaproxy/web/images/40/handytone.png
-mediaproxy/web/images/40/hitachi-wip5000-2.png
-mediaproxy/web/images/40/hitachi-wip5000-3.png
-mediaproxy/web/images/40/hitachi-wip5000.png
-mediaproxy/web/images/40/innomedia-mta5000.png
-mediaproxy/web/images/40/ipDialog.png
-mediaproxy/web/images/40/linksys-pap2-vert.png
-mediaproxy/web/images/40/linksys-pap2.png
-mediaproxy/web/images/40/messenger.png
-mediaproxy/web/images/40/nokia.png
-mediaproxy/web/images/40/session.png
-mediaproxy/web/images/40/siemens-3610.png
-mediaproxy/web/images/40/sipps.png
-mediaproxy/web/images/40/sjphone.png
-mediaproxy/web/images/40/snom100.png
-mediaproxy/web/images/40/snom200.png
-mediaproxy/web/images/40/snom320-front.png
-mediaproxy/web/images/40/snom320-left.png
-mediaproxy/web/images/40/snom320.png
-mediaproxy/web/images/40/snom360-front.png
-mediaproxy/web/images/40/snom360-left.png
-mediaproxy/web/images/40/snom360.png
-mediaproxy/web/images/40/spa2000.png
-mediaproxy/web/images/40/unknown.png
-mediaproxy/web/images/40/unknown3.png
-mediaproxy/web/images/40/vizufon.png
-mediaproxy/web/images/40/vizufon2.png
-mediaproxy/web/images/40/webstarexp2203.png
-mediaproxy/web/images/40/xten.png
-mediaproxy/web/images/40/zoep.png
-mediaproxy/web/images/40/zyxel-p2000.png
-mediaproxy/web/media_sessions.phtml
-@dirrm mediaproxy/web/images/40
-@dirrm mediaproxy/web/images/35
-@dirrm mediaproxy/web/images/30
-@dirrm mediaproxy/web/images
-@dirrm mediaproxy/web/config
-@dirrm mediaproxy/web
-@dirrm mediaproxy/utils
-@dirrm mediaproxy/modules/external/DNS
-@dirrm mediaproxy/modules/external
-@dirrm mediaproxy/modules
-@dirrm mediaproxy/log
-@dirrm mediaproxy/boot/macosx/MEDIAPROXY
-@dirrm mediaproxy/boot/macosx
-@dirrm mediaproxy/boot
-@dirrm mediaproxy
diff --git a/net/mknbi/Makefile b/net/mknbi/Makefile
deleted file mode 100644
index 2db113dba926..000000000000
--- a/net/mknbi/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Created by: X
-# $FreeBSD$
-
-PORTNAME=	mknbi
-PORTVERSION=	1.4.4
-CATEGORIES=	net
-MASTER_SITES=	SF/etherboot/${PORTNAME}/${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Creates tagged boot images for net/ether boot
-
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
-
-MAN1=		mknbi.1 disnbi.1
-.for i in	mkelf.1 mknbi-linux.1 mkelf-linux.1 \
-		mknbi-rom.1 mkelf-img.1 mknbi-menu.1 mkelf-menu.1 \
-		mknbi-nfl.1 mkelf-nfl.1 mknbi-dos.1 mknbi-fdos.1 mkelf-lua.1
-MLINKS+=	mknbi.1 ${i}
-.endfor
-
-PORTDOCS=	COPYING README LOG spec.txt
-
-USES=		perl5 gmake
-ONLY_FOR_ARCHS=	i386
-
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e 's,^static int terminal,int terminal,' \
-		${WRKSRC}/nfl.c
-
-.include <bsd.port.mk>
diff --git a/net/mknbi/distinfo b/net/mknbi/distinfo
deleted file mode 100644
index 730422f99345..000000000000
--- a/net/mknbi/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mknbi-1.4.4.tar.gz) = e5c62131a79cebf31234af252975d4c242ed8face0249f11a5772aeff50e3f02
-SIZE (mknbi-1.4.4.tar.gz) = 212454
diff --git a/net/mknbi/files/patch-Makefile b/net/mknbi/files/patch-Makefile
deleted file mode 100644
index 6d74f89e64bd..000000000000
--- a/net/mknbi/files/patch-Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.orig	Tue Aug 17 04:47:29 2004
-+++ Makefile	Thu Mar 17 21:33:37 2005
-@@ -18,7 +18,7 @@
- FIRSTRELOCS=	0x92800 0x82800
- OLDGAS:=	$(shell $(AS) --version | grep -q '2\.9\.1' && echo -DGAS291)
- CFLAGS=		-I. -Os -ffreestanding -fstrength-reduce -fomit-frame-pointer \
--		-mcpu=i386 \
-+		-march=i386 \
- 		-Wall -W -Wno-format -Wno-unused -DVERSION=\"$(VERSION)$(EXTRAVERSION)\"
- LDBINARYFLAG=	--oformat binary
- FIRST32SIZE=	6144
-@@ -38,13 +38,13 @@
- # Must pick ANSIMODE=1 if ANSIESC is chosen
- BOOTMENU_FLAGS=	-DCONSOLE_CRT -DANSIESC -DANSIMODE=1 -DMOTD -DUSRPARMS -DPASSWD -DPOWERSAVE -DCOMCONSOLE=0x3f8 -DCOMPRESERVE
- 
--PREFIX=		/usr/local
-+PREFIX?=		/usr/local
- INSTPREFIX=	$(BUILD_ROOT)$(PREFIX)
- LIBDIR=		$(PREFIX)/lib/mknbi
- INSTLIBDIR=	$(INSTPREFIX)/lib/mknbi
- BINDIR=		$(INSTPREFIX)/bin
--MANDIR=		$(INSTPREFIX)/share/man/man1
--DOCDIR=		$(INSTPREFIX)/share/doc/packages/mknbi-$(RPMVERSION)
-+MANDIR=		$(INSTPREFIX)/man/man1
-+DOCDIR=		$(INSTPREFIX)/share/doc/mknbi
- 
- INSTALL=	install
- 
diff --git a/net/mknbi/pkg-descr b/net/mknbi/pkg-descr
deleted file mode 100644
index d3de39f82aa1..000000000000
--- a/net/mknbi/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-mknbi is a program that makes network bootable images for various operating
-systems suitable for network loading by Etherboot or Netboot, which are ROM
-boot loaders. If you are looking to boot using PXE, look no further, mknbi is
-not what you want. You probably want something like PXELINUX which is part of
-the SYSLINUX package.
-
-WWW: http://www.etherboot.org/
diff --git a/net/mknbi/pkg-plist b/net/mknbi/pkg-plist
deleted file mode 100644
index 95f5b38124ed..000000000000
--- a/net/mknbi/pkg-plist
+++ /dev/null
@@ -1,35 +0,0 @@
-bin/mknbi-linux
-bin/mknbi-rom
-bin/mknbi-fdos
-bin/mknbi-dos
-bin/mknbi-menu
-bin/mknbi-nfl
-bin/mkelf-linux
-bin/mkelf-img
-bin/mkelf-menu
-bin/mkelf-nfl
-bin/mkelf-lua
-bin/disnbi
-bin/dismbr
-bin/disdosbb
-bin/nbitoelf
-lib/mknbi/mknbi
-lib/mknbi/disnbi
-lib/mknbi/dismbr
-lib/mknbi/disdosbb
-lib/mknbi/nbitoelf
-lib/mknbi/Nbi.pm
-lib/mknbi/Elf.pm
-lib/mknbi/TruncFD.pm
-lib/mknbi/first32@0x92800.linux
-lib/mknbi/first32elf@0x92800.linux
-lib/mknbi/first32@0x82800.linux
-lib/mknbi/first32elf@0x82800.linux
-lib/mknbi/first.dos
-lib/mknbi/first.fdos
-lib/mknbi/menu
-lib/mknbi/nfl
-lib/mknbi/altboot.bin
-lib/mknbi/rmrd.com
-lib/mknbi/lua
-@dirrm lib/mknbi
diff --git a/net/mmucl/Makefile b/net/mmucl/Makefile
deleted file mode 100644
index b4675b205c51..000000000000
--- a/net/mmucl/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Created by: Matt Heckaman <matt@LUCIDA.QC.CA>
-# $FreeBSD$
-
-PORTNAME=	mmucl
-PORTVERSION=	1.5.2
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	SF
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Powerful GUI MUD client written in TCL
-
-LIB_DEPENDS=	libtcl84.so:${PORTSDIR}/lang/tcl84
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
-
-USES=		gmake
-MAKE_ARGS=	BASE_DIR=${PREFIX} TCLSH=tclsh8.4 INFO_DIR=${PREFIX}/info \
-		INSTALL_INFO=/usr/bin/install-info
-INFO=		mmucl
-
-NO_STAGE=	yes
-post-install:
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/net/mmucl/distinfo b/net/mmucl/distinfo
deleted file mode 100644
index 1a62b8ea3ab4..000000000000
--- a/net/mmucl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mmucl-1.5.2.tar.gz) = 7bc5ca6c35ffc92bd1ceca08cd7121a1edd1d5a1935a81e6976f1404e9b4a94d
-SIZE (mmucl-1.5.2.tar.gz) = 144697
diff --git a/net/mmucl/files/patch-aa b/net/mmucl/files/patch-aa
deleted file mode 100644
index b7150b768e9f..000000000000
--- a/net/mmucl/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Tue Nov 15 16:54:01 2005
-+++ Makefile	Tue Nov 15 16:54:16 2005
-@@ -45,7 +45,7 @@
- 	$(INSTALL) -cm 0644 interface/*.tcl $(LIB_DIR)/interface
- 	$(INSTALL) -cm 0644 script/*.tcl script/*.rc $(LIB_DIR)/script
- 	$(INSTALL) -cm 0644 script/contrib/*.tcl $(LIB_DIR)/script/contrib
--	$(INSTALL) -cm 0755 mmucl2 $(BIN_DIR)
-+	$(INSTALL) -cm 0755 mmucl2 $(BIN_DIR)/mmucl
- 	$(INSTALL) -cm 0644 mmucl.info $(INFO_DIR)
- 	$(INSTALL_INFO) $(INFO_DIR)/mmucl.info --info-dir=$(INFO_DIR)
- 
diff --git a/net/mmucl/pkg-descr b/net/mmucl/pkg-descr
deleted file mode 100644
index d46e0dc6766e..000000000000
--- a/net/mmucl/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Mmucl - Mark's MUd CLient (pronounced muckle) is a MUD client written in TCL
-and distributed under the GNU GPL. This client supports a powerful aliasing
-system using TCL as well as three different interfaces that can be used.
-This client also has the advantage of being able to run on any platform that
-supports TCL/TK.
-
-WWW:  http://mmucl.sourceforge.net
-
-Matt Heckaman
-matt@LUCIDA.CA
diff --git a/net/mmucl/pkg-plist b/net/mmucl/pkg-plist
deleted file mode 100644
index dcf9b44725ba..000000000000
--- a/net/mmucl/pkg-plist
+++ /dev/null
@@ -1,39 +0,0 @@
-bin/mmucl
-lib/mmucl2/images/action.gif
-lib/mmucl2/images/alias.gif
-lib/mmucl2/images/bind.gif
-lib/mmucl2/images/char.gif
-lib/mmucl2/images/connect.gif
-lib/mmucl2/images/help.gif
-lib/mmucl2/images/load.gif
-lib/mmucl2/images/mmucl.gif
-lib/mmucl2/images/quit.gif
-lib/mmucl2/images/save.gif
-lib/mmucl2/images/send.gif
-lib/mmucl2/images/sub.gif
-@dirrm lib/mmucl2/images
-lib/mmucl2/interface/gnome.tcl
-lib/mmucl2/interface/readline.tcl
-lib/mmucl2/interface/text.tcl
-lib/mmucl2/interface/tk.tcl
-@dirrm lib/mmucl2/interface
-lib/mmucl2/lib/connect.tcl
-lib/mmucl2/lib/connect_test.tcl
-lib/mmucl2/lib/misc.tcl
-lib/mmucl2/lib/mmucl.tcl
-lib/mmucl2/lib/ntkinfo.tcl
-lib/mmucl2/script/channel.tcl
-lib/mmucl2/script/contrib/mmchat.tcl
-lib/mmucl2/script/email.tcl
-lib/mmucl2/script/map.tcl
-lib/mmucl2/script/mmucl.rc
-lib/mmucl2/script/monitor.tcl
-lib/mmucl2/script/msp.tcl
-lib/mmucl2/script/robot.tcl
-@dirrm lib/mmucl2/script/contrib
-@dirrm lib/mmucl2/script
-@dirrm lib/mmucl2/lib
-@dirrm lib/mmucl2
-%%DOCSDIR%%/CHANGES
-%%DOCSDIR%%/README
-@dirrm %%DOCSDIR%%
diff --git a/net/ncplib/Makefile b/net/ncplib/Makefile
deleted file mode 100644
index 5860830fd602..000000000000
--- a/net/ncplib/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Created by: Boris Popov <bp@butya.kz>
-# $FreeBSD$
-
-PORTNAME=	ncplib
-PORTVERSION=	1.3.4
-CATEGORIES=	net
-MASTER_SITES=	http://rbp.chat.ru/pub/nwlib/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Utilities to work with Novell NetWare servers
-
-ONLY_FOR_ARCHS=	i386
-
-.if !exists(/usr/src/sys/kern/vnode_if.src)
-IGNORE=		requires kernel source
-.endif
-
-MANCOMPRESSED=	yes
-
-MAN1=	ncpasswd.1 ncprint.1 ncpsend.1 ncpurge.1
-MAN8=	ipxping.8 ncpsvc.8
-
-NO_STAGE=	yes
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/ncplib/distinfo b/net/ncplib/distinfo
deleted file mode 100644
index 5d6244fa3ab8..000000000000
--- a/net/ncplib/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ncplib-1.3.4.tar.gz) = dd310ef5641aad870343de8417f98d2f46db32560fe579389a9a928282a7e193
-SIZE (ncplib-1.3.4.tar.gz) = 134953
diff --git a/net/ncplib/files/patch-Makefile.inc b/net/ncplib/files/patch-Makefile.inc
deleted file mode 100644
index d2152a262f53..000000000000
--- a/net/ncplib/files/patch-Makefile.inc
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.inc.orig	Fri Apr 25 20:10:52 2003
-+++ Makefile.inc	Fri Apr 25 20:14:54 2003
-@@ -11,6 +11,7 @@
- BINDIR?=${PREFIX}/bin
- NCPSBINDIR=${PREFIX}/sbin
- MANDIR=${PREFIX}/man/man
-+NOOBJ=	yes
- 
- CFLAGS	+= -Wall
- 
-@@ -18,9 +19,7 @@
- CFLAGS+=	-ggdb
- .endif
- 
--.include <bsd.libnames.mk>
--
--.if !defined(LIBNCP) ||  defined(COMPLETEBUILD)
-+.if defined(COMPLETEBUILD)
- CFLAGS	+= -L../lib/ncp
- CFLAGS	+= -I../include
- LIBNCP	= ../lib/ncp/libncp.a
diff --git a/net/ncplib/pkg-descr b/net/ncplib/pkg-descr
deleted file mode 100644
index 8b67cb61f232..000000000000
--- a/net/ncplib/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-A free client for Novell NetWare servers.
diff --git a/net/ncplib/pkg-plist b/net/ncplib/pkg-plist
deleted file mode 100644
index 883fd6b8e888..000000000000
--- a/net/ncplib/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/ipxping
-bin/ncpasswd
-bin/ncplpd
-bin/ncprint
-bin/ncpsend
-bin/ncpurge
-sbin/ncpsvc
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/ncplib/scripts/configure b/net/ncplib/scripts/configure
deleted file mode 100644
index dc6d4cd85687..000000000000
--- a/net/ncplib/scripts/configure
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-CMK=${WRKSRC}/config.mk
-
-echo "SRCTREE=/usr/src" > $CMK
-echo "PREFIX="$PREFIX >> $CMK
-echo "BUILDKLD=yes" >> $CMK
-
-echo "NCP_NLS_KOI_866=" >> $CMK
-echo "NCP_NLS_DEFAULT=NCP_NLS_KOI_866" >> $CMK
diff --git a/net/ng_daphne/Makefile b/net/ng_daphne/Makefile
deleted file mode 100644
index 21c7c484fa6b..000000000000
--- a/net/ng_daphne/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# Created by: Gerasimos Dimitriadis
-# $FreeBSD$
-
-PORTNAME=	ng_daphne
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	net kld
-MASTER_SITES=	http://newton.ee.auth.gr/ng_daphne/ \
-		LOCAL/glarkin
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Simple netgraph module for multihop ad hoc networks
-
-SSP_UNSAFE=	kernel module does not support ssp
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-SYSDIR?=	${SRC_BASE}/sys
-.if !exists(${SYSDIR}/netgraph/netgraph.h)
-IGNORE=		requires kernel source (/usr/src/sys) to build
-.endif
-MAKE_ENV+=	WERROR=
-
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-ng_daphne.c
-PLIST_FILES=	lib/ng_daphne.ko
-PORTDOCS=	README
-SUB_FILES=	pkg-message
-
-do-install:
-	${INSTALL_KLD} ${WRKSRC}/ng_daphne.ko ${PREFIX}/lib
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/net/ng_daphne/distinfo b/net/ng_daphne/distinfo
deleted file mode 100644
index e01e6e4d0dd2..000000000000
--- a/net/ng_daphne/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ng_daphne-1.0.tar.gz) = 4384b60f1abeb31bcd08b1d81f522e5b634595cecf36130f464a48013b5be15a
-SIZE (ng_daphne-1.0.tar.gz) = 13371
diff --git a/net/ng_daphne/files/extra-patch-ng_daphne.c b/net/ng_daphne/files/extra-patch-ng_daphne.c
deleted file mode 100644
index 484e445e43ef..000000000000
--- a/net/ng_daphne/files/extra-patch-ng_daphne.c
+++ /dev/null
@@ -1,86 +0,0 @@
---- ng_daphne.c.orig	Fri Feb 13 13:08:06 2004
-+++ ng_daphne.c	Wed Jun  9 13:00:20 2004
-@@ -108,7 +108,7 @@
- 	  NGM_DAPHNE_COOKIE,
- 	  NGM_DAPHNE_SET_ENADDR,
- 	  "setenaddr",
--	  &ng_ether_enaddr_type,
-+	  &ng_parse_enaddr_type,
- 	  NULL
- 	},
- 	{
-@@ -116,7 +116,7 @@
- 	  NGM_DAPHNE_GET_ENADDR,
- 	  "getenaddr",
- 	  NULL,
--	  &ng_ether_enaddr_type
-+	  &ng_parse_enaddr_type
- 	},
- 	{ 0 }
- };
-@@ -126,18 +126,16 @@
-  * Node type descriptor
-  */
- static struct ng_type ng_daphne_typestruct = {
--	NG_ABI_VERSION,
--	NG_DAPHNE_NODE_TYPE,
--	NULL,
--	ng_daphne_constructor,
--	ng_daphne_rcvmsg,
--	ng_daphne_shutdown,
--	ng_daphne_newhook,
--	NULL,
--	ng_daphne_connect,
--	ng_daphne_rcvdata,
--	ng_daphne_disconnect,
--	ng_daphne_cmdlist,
-+	.version =	NG_ABI_VERSION,
-+	.name =		NG_DAPHNE_NODE_TYPE,
-+	.constructor = 	ng_daphne_constructor,
-+	.rcvmsg =	ng_daphne_rcvmsg,
-+	.shutdown =	ng_daphne_shutdown,
-+	.newhook =	ng_daphne_newhook,
-+	.connect =	ng_daphne_connect,
-+	.rcvdata =	ng_daphne_rcvdata,
-+	.disconnect =	ng_daphne_disconnect,
-+	.cmdlist =	ng_daphne_cmdlist,
- };
- 
- NETGRAPH_INIT(daphne, &ng_daphne_typestruct);
-@@ -311,22 +309,18 @@
- 			/* The peer node is eiface. If we know out hardware address, let it know */
- 			if (priv->myRowHead)
- 			{
--				struct ng_eiface_par *eiAddr;
-+				struct ether_addr *eiAddr;
- 
--				NG_MKMESSAGE (msg, NGM_EIFACE_COOKIE, NGM_EIFACE_SET, sizeof (struct ng_eiface_par), M_NOWAIT);
-+				NG_MKMESSAGE (msg, NGM_EIFACE_COOKIE, NGM_EIFACE_SET, sizeof (struct ether_addr), M_NOWAIT);
- 
- 				if (msg == NULL)
- 					return (ENOMEM);
- 
- 				/* Fill up msg data */
--				eiAddr = (struct ng_eiface_par *)(msg->data);
-+				eiAddr = (struct ether_addr *)(msg->data);
- 
--				eiAddr->oct0 = priv->myRowHead->etherAddr[0];
--				eiAddr->oct1 = priv->myRowHead->etherAddr[1];
--				eiAddr->oct2 = priv->myRowHead->etherAddr[2];
--				eiAddr->oct3 = priv->myRowHead->etherAddr[3];
--				eiAddr->oct4 = priv->myRowHead->etherAddr[4];
--				eiAddr->oct5 = priv->myRowHead->etherAddr[5];
-+				bcopy((void *)priv->myRowHead->etherAddr,
-+				    (void *)&eiAddr, sizeof(struct ether_addr));
- 
- 				/* Send message to this node */
- 				NG_SEND_MSG_ID (error, node, msg, NG_PEER_NODE(hook)->nd_ID, 0);
-@@ -1208,7 +1202,7 @@
- 					{
- 						FREE_CHAIN (p_tempRowHead->neighbours, rtElem);
- 						p_tempRowHead->neighbours = NULL;
--						p_tempRowHead->numNeighb = NULL;
-+						p_tempRowHead->numNeighb = 0;
- 						p_tempRowHead->routingSeqNum = 0;
- 						p_tempRowHead->routingSeqNumTimer = 0;
- 
diff --git a/net/ng_daphne/files/patch-Makefile b/net/ng_daphne/files/patch-Makefile
deleted file mode 100644
index dfc153f45db5..000000000000
--- a/net/ng_daphne/files/patch-Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- Makefile.orig	Wed Jun 15 15:18:23 2005
-+++ Makefile	Wed Jun 15 15:18:07 2005
-@@ -1,4 +1,4 @@
- KMOD=	ng_daphne
--SRCS= 	ng_daphne.c
-+SRCS= 	ng_daphne.c opt_netgraph.h
- 
- .include <bsd.kmod.mk>
diff --git a/net/ng_daphne/files/pkg-message.in b/net/ng_daphne/files/pkg-message.in
deleted file mode 100644
index b576611551d9..000000000000
--- a/net/ng_daphne/files/pkg-message.in
+++ /dev/null
@@ -1,4 +0,0 @@
-
-The ng_daphne.ko module has been installed to %%PREFIX%%/lib. You may
-wish to add this to your kern.module_path sysctl or copy it to
-another location.
diff --git a/net/ng_daphne/pkg-descr b/net/ng_daphne/pkg-descr
deleted file mode 100644
index 5cf2b46743a1..000000000000
--- a/net/ng_daphne/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-ng_daphne is a FreeBSD netgraph kernel module which allows the easy
-creation of multihop ad hoc networks. ng_daphne employs the GSR
-(Global State Routing) algorithm with hardware addresses, in order to
-give the impression to upper layers that all network nodes are within
-one hop from each other. 
diff --git a/net/ng_mikrotik_eoip/Makefile b/net/ng_mikrotik_eoip/Makefile
deleted file mode 100644
index 03258809c958..000000000000
--- a/net/ng_mikrotik_eoip/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Created by: Maxim Ignatenko
-# $FreeBSD$
-
-PORTNAME=	ng_mikrotik_eoip
-PORTVERSION=	1.0
-CATEGORIES=	net kld
-MASTER_SITES=	http://projects.ukrweb.net/files/ \
-		http://imax.in.ua/files/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Netgraph node for Mikrotik EoIP tunneling
-
-LICENSE=	BSD
-
-SSP_UNSAFE=	kernel module does not support ssp
-
-OPTIONS_DEFINE=	PTABLE	
-PTABLE_DESC=	Use O(1) lookup for tunnel hooks
-# This option enables usage of static pointer table to find needed decimal-named hook,
-# which increases memory usage for each node by 65536*sizeof(hook_p). You probably want
-# this option if you have many tunnels with single remote IP.
-
-KMODDIR?=	/boot/modules
-PLIST_SUB+=	KMODDIR=${KMODDIR} \
-		PORTNAME=${PORTNAME}
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if !exists(${SRC_BASE}/sys/sys/module.h)
-IGNORE=		requires kernel source files
-.endif
-
-.if ${PORT_OPTIONS:MPTABLE}
-MAKE_ARGS+=	NO_LINEAR_HOOK_LOOKUP=1
-.endif
-
-do-install:
-	@${INSTALL_KLD} ${WRKSRC}/${PORTNAME}.ko ${KMODDIR}
-
-.include <bsd.port.mk>
diff --git a/net/ng_mikrotik_eoip/distinfo b/net/ng_mikrotik_eoip/distinfo
deleted file mode 100644
index 32049025b929..000000000000
--- a/net/ng_mikrotik_eoip/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ng_mikrotik_eoip-1.0.tar.gz) = 3180b68660d110fc217e3b5b5e4cc94bee69dee2933a811b5c0349ea644952c8
-SIZE (ng_mikrotik_eoip-1.0.tar.gz) = 4154
diff --git a/net/ng_mikrotik_eoip/pkg-descr b/net/ng_mikrotik_eoip/pkg-descr
deleted file mode 100644
index 244376af3903..000000000000
--- a/net/ng_mikrotik_eoip/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Netgraph node for Mikrotik Ethernet-over-IP tunneling support
-
-WWW: http://imax.in.ua/ng_mikrotik_eoip/
diff --git a/net/ng_mikrotik_eoip/pkg-plist b/net/ng_mikrotik_eoip/pkg-plist
deleted file mode 100644
index 1be1dafaa643..000000000000
--- a/net/ng_mikrotik_eoip/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-@cwd /
-%%KMODDIR%%/%%PORTNAME%%.ko
-@exec /usr/sbin/kldxref /%%KMODDIR%%
-@unexec /usr/sbin/kldxref /%%KMODDIR%%
diff --git a/net/openam/Makefile b/net/openam/Makefile
deleted file mode 100644
index 108491402fde..000000000000
--- a/net/openam/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by: Roger Hardiman <roger@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	openam
-PORTVERSION=	1.1.18
-PORTREVISION=	3
-CATEGORIES=	net
-MASTER_SITES=	http://www.voxgratia.org/releases/
-DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}-src-
-EXTRACT_SUFX=	tar.gz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	H323 Answer Machine
-
-LIB_DEPENDS=	libh323_r.so:${PORTSDIR}/net/openh323
-
-WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
-
-USES=		gmake
-ALL_TARGET=	optshared
-MAKE_ENV=	PWLIBDIR=${LOCALBASE}/share/pwlib \
-		OPENH323DIR=${LOCALBASE}/share/openh323 \
-		SYSLIBDIR=${LOCALBASE}/lib
-MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${ARCH:S/i386/x86/} \
-		OSRELEASE=${OSVERSION} CPLUS=${CXX}
-
-PLIST_SUB=	PORTNAME=${PORTNAME}
-DOCSDIR=	${PREFIX}/share/doc/openh323
-
-NO_STAGE=	yes
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/obj_r/openam ${PREFIX}/bin
-	@${MKDIR} ${DOCSDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${DOCSDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/sample_message.wav ${DOCSDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/sample_message_g7231.wav ${DOCSDIR}/${PORTNAME}
-
-.include <bsd.port.mk>
diff --git a/net/openam/distinfo b/net/openam/distinfo
deleted file mode 100644
index 51b840d0e763..000000000000
--- a/net/openam/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (openam-v1_1_18-src-tar.gz) = afbc80d104476d48e060b28a438fa21404b81c2b8537a590fe0822968cc685b9
-SIZE (openam-v1_1_18-src-tar.gz) = 252554
diff --git a/net/openam/pkg-descr b/net/openam/pkg-descr
deleted file mode 100644
index dc9d9db3aa6e..000000000000
--- a/net/openam/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-OpenAM is a H323 Answer Machine.
-It is used to record messages from other users while you
-are unavailable.
-
-It accepts calls from any H323 Video Conferencing client,
-including OhPhone (part of OpenH323) and MS NetMeeting.
-
-It makes use of PWLib and the OpenH323 stack from Equivalence Ltd Pty
diff --git a/net/openam/pkg-plist b/net/openam/pkg-plist
deleted file mode 100644
index 4170da6757d4..000000000000
--- a/net/openam/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/openam
-%%DOCSDIR%%/%%PORTNAME%%/ReadMe.txt
-%%DOCSDIR%%/%%PORTNAME%%/sample_message.wav
-%%DOCSDIR%%/%%PORTNAME%%/sample_message_g7231.wav
-@dirrm %%DOCSDIR%%/%%PORTNAME%%
-@dirrmtry %%DOCSDIR%%
diff --git a/net/openmcu/Makefile b/net/openmcu/Makefile
deleted file mode 100644
index 944aa1003dbc..000000000000
--- a/net/openmcu/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# Created by: Roger Hardiman <roger@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	openmcu
-PORTVERSION=	2.2.1
-PORTREVISION=	3
-CATEGORIES=	net
-MASTER_SITES=	SF/openh323/${PORTNAME}/${PORTVERSION}
-DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}-src
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	OpenMCU hosts a conference call for H323 Video Conferencing users
-
-LIB_DEPENDS=	libh323_r.so:${PORTSDIR}/net/openh323
-
-WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
-
-USES=		bison gmake
-ALL_TARGET=	optshared
-MAKE_ENV=	PWLIBDIR=${LOCALBASE}/share/pwlib \
-		OPENH323DIR=${LOCALBASE}/share/openh323 \
-		SYSLIBDIR=${LOCALBASE}/lib
-MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${ARCH:S/i386/x86/} \
-		OSRELEASE=${OSVERSION} CPLUS=${CXX}
-
-MAN1=		openmcu.1
-
-PLIST_SUB=	PORTNAME=${PORTNAME}
-DOCSDIR=	${PREFIX}/share/doc/openh323
-EXAMPLESDIR=	${PREFIX}/share/examples/openh323
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == sparc64
-BROKEN=		Does not install
-.endif
-
-pre-install:
-	@${SED}	-e 's|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g' \
-		-e 's|%%PORTNAME%%|${PORTNAME}|g' \
-		${FILESDIR}/openmcu.ini.sample > ${WRKDIR}/openmcu.ini
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/obj_r/openmcu ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${DOCSDIR}/${PORTNAME}
-.endif
-	@${MKDIR} ${EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/*.wav ${EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKDIR}/openmcu.ini ${EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/server.pem ${EXAMPLESDIR}/${PORTNAME}
-
-.include <bsd.port.post.mk>
diff --git a/net/openmcu/distinfo b/net/openmcu/distinfo
deleted file mode 100644
index 0226a0803c6c..000000000000
--- a/net/openmcu/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (openmcu-v2_2_1-src.tar.gz) = 09d7b3f897fa5b76024753f53828f5596c39757b372b55a55b8893d1ae63796a
-SIZE (openmcu-v2_2_1-src.tar.gz) = 155199
diff --git a/net/openmcu/files/openmcu.ini.sample b/net/openmcu/files/openmcu.ini.sample
deleted file mode 100644
index 2b699b0dff62..000000000000
--- a/net/openmcu/files/openmcu.ini.sample
+++ /dev/null
@@ -1,13 +0,0 @@
-[Parameters]
-Password=
-Log Level=2
-HTTP Certificate=%%EXAMPLESDIR%%/%%PORTNAME%%/server.pem
-HTTP Port=1420
-Gatekeeper Mode=Find gatekeeper
-Interface Array Size=0
-Default room=room101
-Connecting WAV File=%%EXAMPLESDIR%%/%%PORTNAME%%/connecting.wav
-Entering WAV File=%%EXAMPLESDIR%%/%%PORTNAME%%/entering.wav
-Leaving WAV File=%%EXAMPLESDIR%%/%%PORTNAME%%/leaving.wav
-Call log filename=/var/log/%%PORTNAME%%/%%PORTNAME%%_call.log
-
diff --git a/net/openmcu/files/patch-filemembers_h b/net/openmcu/files/patch-filemembers_h
deleted file mode 100644
index 458710304b04..000000000000
--- a/net/openmcu/files/patch-filemembers_h
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN openmcu_v2_2_1.bak/filemembers.h openmcu_v2_2_1/filemembers.h
---- filemembers.h      2006-08-02 02:24:53.000000000 -0400
-+++ filemembers.h      2008-03-05 22:08:52.000000000 -0500
-@@ -84,6 +84,7 @@
- #include <opalwavfile.h>
- #include "conference.h"
-
-+#include <queue>
-
- class ConferenceSoundCardMember : public ConferenceMember
- {
diff --git a/net/openmcu/files/patch-video_cxx b/net/openmcu/files/patch-video_cxx
deleted file mode 100644
index fb94cfeb4e27..000000000000
--- a/net/openmcu/files/patch-video_cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- video.cxx.orig	2006-07-21 10:01:40.000000000 +0200
-+++ video.cxx	2008-03-06 09:31:48.000000000 +0100
-@@ -285,7 +285,7 @@
- 
- BOOL PVideoInputDevice_OpenMCU::GetFrameData(BYTE * buffer, PINDEX * bytesReturned)
- {    
--  grabDelay.Delay(msBetweenFrames);
-+  grabDelay.Delay(1000/GetFrameRate());
- 
-   return GetFrameDataNoDelay(buffer, bytesReturned);
- }
diff --git a/net/openmcu/pkg-descr b/net/openmcu/pkg-descr
deleted file mode 100644
index 87f4b1e827b4..000000000000
--- a/net/openmcu/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-OpenMCU is a H323 Multipoint Conference Unit.
-
-It allows several people to take part in the same Video Conference or
-Internet Phone Call (VoIP) when using program using the H323 protocols.
-
-Applications using H323 include OpenH323, OhPhone, GnomeMeeting
-and Microsoft's NetMeeting.
-
-It makes use of PWLib and the OpenH323 stack from Equivalence Ltd Pty
diff --git a/net/openmcu/pkg-plist b/net/openmcu/pkg-plist
deleted file mode 100644
index 792c6bf50f78..000000000000
--- a/net/openmcu/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-bin/openmcu
-%%EXAMPLESDIR%%/%%PORTNAME%%/connecting.wav
-%%EXAMPLESDIR%%/%%PORTNAME%%/entering.wav
-%%EXAMPLESDIR%%/%%PORTNAME%%/leaving.wav
-%%EXAMPLESDIR%%/%%PORTNAME%%/openmcu.ini
-%%EXAMPLESDIR%%/%%PORTNAME%%/server.pem
-@dirrm %%EXAMPLESDIR%%/%%PORTNAME%%
-@dirrmtry %%EXAMPLESDIR%%
-%%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/ReadMe.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%PORTNAME%%
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
diff --git a/net/openser/Makefile b/net/openser/Makefile
deleted file mode 100644
index 85ccbd348f4b..000000000000
--- a/net/openser/Makefile
+++ /dev/null
@@ -1,174 +0,0 @@
-# Created by: jesusr
-# $FreeBSD$
-
-PORTNAME=	openser
-PORTVERSION=	1.2.3
-PORTREVISION=	3
-CATEGORIES=	net
-MASTER_SITES=	http://openser.org/pub/openser/${PORTVERSION}/src/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-tls_src
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Fast and configurable SIP proxy with TLS support
-
-LIB_DEPENDS=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-tls
-
-USES=		gmake
-USE_GNOME=	libxml2
-MAKE_ENV=	CC_EXTRA_OPTS="${CFLAGS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-
-PLIST_FILES=	sbin/openser sbin/openserctl sbin/openserunix \
-		lib/openser/openserctl/openserctl.base lib/openser/openserctl/openserctl.ctlbase \
-		lib/openser/openserctl/openserctl.fifo lib/openser/openserctl/openserctl.sqlbase \
-		lib/openser/openserctl/openserctl.unixsock \
-		etc/openser/openserctlrc
-
-PLIST_DIRS=	lib/openser/modules lib/openser/openserctl lib/openser
-
-MODULES=	acc alias_db auth auth_db avpops cpl-c dbtext \
-		dialog dispatcher diversion domain domainpolicy enum exec flatstore \
-		gflags group imc lcr mangler maxfwd mediaproxy mi_fifo msilo \
-		nathelper options pa path pdt permissions pike \
-		registrar rr siptrace sl sms speeddial sst statistics \
-		textops tm uac uac_redirect uri \
-		uri_db usrloc xlog
-
-RC_FILES=	acc/radiusclient.conf \
-		acc/servers \
-		dictionary.radius \
-		openser.cfg
-RC_DIRS=	acc
-
-ONLY_FOR_ARCHS=	i386
-
-MAN5=		openser.cfg.5
-MAN8=		openser.8 \
-		openserctl.8 \
-		openserunix.8
-
-PORTDOCS=	*
-
-SUB_FILES=	pkg-install pkg-deinstall
-SUB_LIST=	RC_DIRS="${RC_DIRS}" RC_FILES="${RC_FILES}"
-
-OPTIONS_DEFINE=	MYSQL PGSQL UNIXODBC TLS SNMPSTATS AUTHRADIUS
-OPTIONS_DEFAULT=	MYSQL
-SNMPSTATS_DESC=		SNMPStats support
-AUTHRADIUS_DESC=	auth_radius module
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
-MODULES+=	mysql
-PLIST_FILES+=	lib/openser/openserctl/openserctl.mysql sbin/openser_mysql.sh
-.else
-MAKE_ENV+=	MYSQL=mysql
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
-MODULES+=	postgres
-PLIST_FILES+=	lib/openser/openserctl/openserctl.pgsql sbin/openser_postgresql.sh
-.else
-MAKE_ENV+=	POSTGRESQL=postgres
-.endif
-
-.if ${PORT_OPTIONS:MUNIXODBC}
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
-MODULES+=	unixodbc
-.else
-MAKE_ENV+=	UNIXODBC=unixodbc
-.endif
-
-.if ${PORT_OPTIONS:MTLS}
-MODULES+=	tlsops
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-TLS_RC_FILES=	tls/rootCA/cacert.pem \
-		tls/rootCA/certs/01.pem \
-		tls/rootCA/index.txt \
-		tls/rootCA/private/cakey.pem \
-		tls/rootCA/serial \
-		tls/user/user-calist.pem \
-		tls/user/user-cert.pem \
-		tls/user/user-cert_req.pem \
-		tls/user/user-privkey.pem \
-		tls/README \
-		tls/ca.conf \
-		tls/request.conf \
-		tls/user.conf
-RC_FILES+=	${TLS_RC_FILES}
-TLS_RC_DIRS=	tls/user \
-		tls/rootCA/certs \
-		tls/rootCA/private \
-		tls/rootCA \
-		tls
-RC_DIRS+=	${TLS_RC_DIRS}
-.else
-MAKE_ENV+=	TLSOPS=tlsops
-MAKE_ARGS+=	TLS=""
-.endif
-
-.if ${PORT_OPTIONS:MSNMPSTATS}
-RUN_DEPENDS+=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp
-MODULES+=	snmpstats
-.else
-MAKE_ENV+=	SNMPSTATS=snmpstats
-.endif
-
-.if ${PORT_OPTIONS:MAUTHRADIUS}
-MODULES+=	auth_radius
-PLIST_FILES+=	lib/openser/modules/auth_radius.so
-.else
-MAKE_ENV+=	AUTHRADIUS=auth_radius
-.endif
-
-PLIST_FILES+=	${MODULES:S|^|lib/openser/modules/|:S|$|.so|} \
-		${RC_FILES:S|^|etc/openser/|:S|$|.default|}
-
-post-patch:
-.if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e 's|install-doc install-man|install-man|' \
-		${WRKSRC}/Makefile
-.endif
-	@${REINPLACE_CMD} -e 's|-g -O9 ||' -e 's|-O9 ||' ${WRKSRC}/Makefile.defs
-	@${REINPLACE_CMD} -e 's|/usr/local/etc/ser|${PREFIX}/etc/openser|' \
-		${WRKSRC}/scripts/sc.dbtext \
-		${WRKSRC}/modules/dispatcher/README
-	@${REINPLACE_CMD} -e 's|/etc/openser|${PREFIX}/etc/openser|' \
-		${WRKSRC}/modules/mediaproxy/README \
-		${WRKSRC}/modules/cpl-c/README \
-		${WRKSRC}/INSTALL
-	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
-		${WRKSRC}/etc/openser.cfg \
-		${WRKSRC}/scripts/mysqldb.sh \
-		${WRKSRC}/scripts/postgresqldb.sh \
-		${WRKSRC}/scripts/sc.dbtext \
-		${WRKSRC}/modules/speeddial/README
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
-		${WRKSRC}/modules/acc/etc/radiusclient.conf
-	@${REINPLACE_CMD} -e 's|/usr/local/etc/radiusclient|${PREFIX}/etc/openser/acc|' \
-		${WRKSRC}/modules/acc/acc_mod.c ${WRKSRC}/modules/acc/README
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/etc/openser.cfg \
-		${PREFIX}/etc/openser/openser.cfg.default
-	${MKDIR} ${PREFIX}/etc/openser/acc
-	${INSTALL_DATA} ${WRKSRC}/modules/acc/etc/radiusclient.conf \
-		${PREFIX}/etc/openser/acc/radiusclient.conf.default
-	${INSTALL_DATA} ${WRKSRC}/modules/acc/etc/servers \
-		${PREFIX}/etc/openser/acc/servers.default
-.for d in ${TLS_RC_DIRS}
-	${MKDIR} ${PREFIX}/etc/openser/${d}
-.endfor
-.for f in ${TLS_RC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/etc/openser/${f}.default
-.endfor
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.mk>
diff --git a/net/openser/distinfo b/net/openser/distinfo
deleted file mode 100644
index 456d3a20d85d..000000000000
--- a/net/openser/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (openser-1.2.3-tls_src.tar.gz) = 58baf7558e5ad9f19be3e47c007b67e38e4eec645ef8e180e3bbf6e5ea63900e
-SIZE (openser-1.2.3-tls_src.tar.gz) = 3325798
diff --git a/net/openser/files/patch-Makefile b/net/openser/files/patch-Makefile
deleted file mode 100644
index 9da825037641..000000000000
--- a/net/openser/files/patch-Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
---- Makefile.orig	Wed Jan 30 14:50:03 2008
-+++ Makefile	Wed Jan 30 16:41:05 2008
-@@ -47,10 +47,10 @@
- skip_modules?=
- 
- # if not set on the cmd. line or the env, exclude this modules:
--exclude_modules?= 		jabber cpl-c mysql pa postgres osp unixodbc \
--						avp_radius auth_radius group_radius uri_radius xmpp \
--						presence pua pua_mi pua_usrloc seas\
--						mi_xmlrpc perl snmpstats
-+exclude_modules?= 		$(MYSQL) $(POSTGRESQL) $(SNMPSTATS) $(TLSOPS) $(UNIXODBC) \
-+						$(AUTHRADIUS) avp_radius group_radius uri_radius xmpp \
-+						presence pua pua_mi pua_usrloc seas mi_xmlrpc perl \
-+						snmpstats jabber osp auth_diameter
- ifeq ($(TLS),)
- 	exclude_modules+= tlsops
- endif
-@@ -343,21 +343,9 @@
- 		
- # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
- install-cfg: $(cfg-prefix)/$(cfg-dir)
--		sed -e "s#/usr/.*lib/$(NAME)/modules/#$(modules-target)#g" \
--			< etc/$(NAME).cfg > $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0
--		sed -e "s#/usr/.*etc/$(NAME)/tls/#$(cfg-target)tls/#g" \
--			< $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0 \
--			> $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample
--		rm -fr $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0
--		chmod 644 $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample
--		if [ -z "${skip_cfg_install}" -a \
--				! -f $(cfg-prefix)/$(cfg-dir)$(NAME).cfg ]; then \
--			mv -f $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample \
--				$(cfg-prefix)/$(cfg-dir)$(NAME).cfg; \
--		fi
- 		# radius dictionary
- 		$(INSTALL_TOUCH) $(cfg-prefix)/$(cfg-dir)/dictionary.radius
--		$(INSTALL_CFG) etc/dictionary.radius $(cfg-prefix)/$(cfg-dir)
-+		$(INSTALL_CFG) etc/dictionary.radius $(cfg-prefix)/$(cfg-dir)/dictionary.radius.default
- 		# openserctl config
- 		$(INSTALL_TOUCH)   $(cfg-prefix)/$(cfg-dir)/openserctlrc.sample
- 		$(INSTALL_CFG) scripts/openserctlrc \
-@@ -391,7 +379,7 @@
- 		sed -e "s#/usr/local/lib/openser#$(lib-target)#g" | \
- 		sed -e "s#/usr/local/etc/openser#$(cfg-target)#g"  >/tmp/openserctl
- 		$(INSTALL_TOUCH) $(bin-prefix)/$(bin-dir)/openserctl
--		$(INSTALL_BIN) /tmp/openserctl $(bin-prefix)/$(bin-dir)
-+		$(BSD_INSTALL_SCRIPT) /tmp/openserctl $(bin-prefix)/$(bin-dir)
- 		rm -fr /tmp/openserctl
- 		sed -e "s#/usr/local/sbin#$(bin-target)#g" \
- 			< scripts/openserctl.base > /tmp/openserctl.base
-@@ -456,7 +444,7 @@
- 			sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-target)#g" \
- 				< scripts/mysqldb.sh > /tmp/$(NAME)_mysql.sh ; \
- 			$(INSTALL_TOUCH)   $(bin-prefix)/$(bin-dir)/$(NAME)_mysql.sh ; \
--			$(INSTALL_BIN) /tmp/$(NAME)_mysql.sh  $(bin-prefix)/$(bin-dir) ; \
-+			$(BSD_INSTALL_SCRIPT) /tmp/$(NAME)_mysql.sh  $(bin-prefix)/$(bin-dir) ; \
- 			rm -fr /tmp/$(NAME)_mysql.sh ; \
- 		fi
- 		if [ "$(PGSQLON)" = "yes" ]; then \
-@@ -469,7 +457,7 @@
- 			sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-target)#g" \
- 				< scripts/postgresqldb.sh > /tmp/$(NAME)_postgresql.sh ; \
- 			$(INSTALL_TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)_postgresql.sh ; \
--			$(INSTALL_BIN) /tmp/$(NAME)_postgresql.sh \
-+			$(BSD_INSTALL_SCRIPT) /tmp/$(NAME)_postgresql.sh \
- 				$(bin-prefix)/$(bin-dir) ; \
- 			rm -fr /tmp/$(NAME)_postgresql.sh ; \
- 		fi
-@@ -494,8 +482,6 @@
- 			if [ -f modules/"$$r"/README ]; then \
- 				$(INSTALL_TOUCH)  $(doc-prefix)/$(doc-dir)/README ; \
- 				$(INSTALL_DOC)  modules/"$$r"/README  \
--									$(doc-prefix)/$(doc-dir)/README ; \
--				mv -f $(doc-prefix)/$(doc-dir)/README \
- 						$(doc-prefix)/$(doc-dir)/README."$$r" ; \
- 			fi ; \
- 		fi ; \
diff --git a/net/openser/files/patch-Makefile.defs b/net/openser/files/patch-Makefile.defs
deleted file mode 100644
index 7899cece0d0a..000000000000
--- a/net/openser/files/patch-Makefile.defs
+++ /dev/null
@@ -1,43 +0,0 @@
---- Makefile.defs.orig	Thu Dec 20 13:34:23 2007
-+++ Makefile.defs	Wed Jan 30 14:58:46 2008
-@@ -131,7 +131,7 @@
- ifeq ($(ARCH_B),64b)
- 	LIBDIR ?= lib64
- else
--	LIBDIR ?= lib
-+	LIBDIR = lib
- 	# assume 32b - it is not really used further
- 	ARCH_B=32b
- endif
-@@ -211,13 +211,13 @@
- TAR ?= tar
- endif
- 
--INSTALL_TOUCH = touch          # used to create the file first (good to 
--                               #  make solaris install work)
--INSTALL_CFG = $(INSTALL) -m 644
--INSTALL_BIN = $(INSTALL) -m 755
--INSTALL_MODULES = $(INSTALL) -m 755
--INSTALL_DOC = $(INSTALL) -m 644
--INSTALL_MAN = $(INSTALL) -m 644
-+INSTALL_TOUCH = :	# used to create the file first (good to
-+				#  make solaris install work)
-+INSTALL_CFG = $(BSD_INSTALL_DATA)
-+INSTALL_BIN = $(BSD_INSTALL_PROGRAM)
-+INSTALL_MODULES = $(BSD_INSTALL_PROGRAM)
-+INSTALL_DOC = $(BSD_INSTALL_DATA)
-+INSTALL_MAN = $(BSD_INSTALL_MAN)
- 
- #set some vars from the environment (and not make builtins)
- CC   := $(shell echo "$${CC}")
-@@ -1205,8 +1205,8 @@
- 
- #add libssl if needed
- ifneq ($(TLS),)
--DEFS+= -I$(LOCALBASE)/ssl/include -I$(LOCALBASE)/include
--LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl  -lcrypto
-+DEFS+= -I$(OPENSSLINC)
-+LIBS+= -L$(OPENSSLLIB) -lssl  -lcrypto
- endif
- 
- ifneq ($(found_lock_method), yes)
diff --git a/net/openser/files/pkg-deinstall.in b/net/openser/files/pkg-deinstall.in
deleted file mode 100644
index 5ca38f0f45b0..000000000000
--- a/net/openser/files/pkg-deinstall.in
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-rc_dir=$PKG_PREFIX/etc/openser
-
-if [ "$2" = DEINSTALL ]; then
-	for f in %%RC_FILES%%; do
-		if /usr/bin/cmp -s $rc_dir/$f.default $rc_dir/$f; then
-			/bin/rm -f $rc_dir/$f
-		fi
-	done
-elif [ "$2" = POST-DEINSTALL ]; then
-	rc_dirs=`for d in %%RC_DIRS%%; do echo $d; done | /usr/bin/sort -r`
-
-	for d in $rc_dirs ""; do
-		/bin/rmdir $rc_dir/$d 2>/dev/null || /usr/bin/true
-	done
-
-	if [ -e $rc_dir ]; then
-		echo "==============================================================================="
-		echo "If you are permanently removing this port, you should manually remove the"
-		echo "$rc_dir directory."
-		echo "==============================================================================="
-	fi
-fi
diff --git a/net/openser/files/pkg-install.in b/net/openser/files/pkg-install.in
deleted file mode 100644
index 79e885fcf5fc..000000000000
--- a/net/openser/files/pkg-install.in
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-[ "$2" != POST-INSTALL ] && exit
-
-rc_dir=$PKG_PREFIX/etc/openser
-
-for f in %%RC_FILES%%; do
-	if ! [ -e $rc_dir/$f ]; then
-		/usr/bin/install -o root -g wheel -m 644 \
-			$rc_dir/$f.default $rc_dir/$f
-	fi
-done
diff --git a/net/openser/pkg-descr b/net/openser/pkg-descr
deleted file mode 100644
index 999c8e06889a..000000000000
--- a/net/openser/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-OpenSER is a very fast and flexible SIP (RFC3261)
-proxy server. Written entirely in C, openser can handle thousands calls
-per second even on low-budget hardware. A C Shell like scripting language
-provides full control over the server's behaviour. It's modular
-architecture allows only required functionality to be loaded.
-Currently the following modules are available: digest authentication,
-CPL scripts, instant messaging, MySQL and UNIXODBC support, a presence agent,
-radius authentication, record routing, an SMS gateway, a jabber gateway, a 
-transaction and dialog module, OSP module, statistics support, 
-registrar and user location, SIMPLE Presence, Perl programming interface,
-SNMP and Java SIP Servlet.
-
-WWW: http://www.openser.org/
diff --git a/net/pfflowd/Makefile b/net/pfflowd/Makefile
deleted file mode 100644
index 3becb191b542..000000000000
--- a/net/pfflowd/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Created by: Andrew Thompson <andy@fud.org.nz>
-# $FreeBSD$
-
-PORTNAME=	pfflowd
-PORTVERSION=	0.7
-CATEGORIES=	net
-MASTER_SITES=	http://www.mindrot.org/files/pfflowd/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Convert pfsync states to NetFlow datagrams
-
-USE_RC_SUBR=	${PORTNAME}
-
-MAN8=		pfflowd.8
-
-PLIST_FILES=	sbin/pfflowd
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 900000
-BROKEN=		does not compile
-.endif
-
-pre-build:
-	${CAT} ${FILESDIR}/pidfile.h > ${WRKSRC}/pidfile.h
-	${CAT} ${FILESDIR}/pidfile.c > ${WRKSRC}/pidfile.c
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pfflowd ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/pfflowd.8 ${PREFIX}/man/man8
-
-.include <bsd.port.post.mk>
diff --git a/net/pfflowd/distinfo b/net/pfflowd/distinfo
deleted file mode 100644
index a43e89edf152..000000000000
--- a/net/pfflowd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (pfflowd-0.7.tar.gz) = 17e5bfe0906db4acaba593764ae1769e8e95f624c7d8d59f04b431393ceb5d56
-SIZE (pfflowd-0.7.tar.gz) = 11317
diff --git a/net/pfflowd/files/patch-Makefile b/net/pfflowd/files/patch-Makefile
deleted file mode 100644
index 67a867e0e4d0..000000000000
--- a/net/pfflowd/files/patch-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig	2006-07-07 01:27:13.000000000 -0700
-+++ Makefile	2008-05-28 13:00:20.000000000 -0700
-@@ -7,14 +7,18 @@
- LIBS=-lpcap -lutil
- LDFLAGS=-g
- 
--CFLAGS=-g -O $(WARNFLAGS)
-+CFLAGS=-g -O
-+
-+.if defined(OLD_PFSYNC)
-+CFLAGS+=-DOLD_PFSYNC
-+.endif
- 
- TARGETS=pfflowd
- 
- all: $(TARGETS)
- 
--pfflowd: pfflowd.o
--	$(CC) $(LDFLAGS) -o $@ pfflowd.o  $(LIBS)
-+pfflowd: pfflowd.o pidfile.o
-+	$(CC) $(LDFLAGS) -o $@ pfflowd.o pidfile.o $(LIBS)
- 
- clean:
- 	rm -f $(TARGETS) *.o core *.core
diff --git a/net/pfflowd/files/patch-pfflowd.c b/net/pfflowd/files/patch-pfflowd.c
deleted file mode 100644
index f2ef857acdd7..000000000000
--- a/net/pfflowd/files/patch-pfflowd.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- pfflowd.c.orig	Tue Sep  7 00:25:57 2004
-+++ pfflowd.c	Wed Nov 10 13:46:53 2004
-@@ -40,7 +40,11 @@
- #include <syslog.h>
- #include <time.h>
- #include <unistd.h>
-+#if defined(__FreeBSD__)
-+#include "pidfile.h"
-+#else
- #include <util.h>
-+#endif
- #include <netdb.h>
- #include "pfflowd.h"
- 
-@@ -115,9 +119,7 @@
- /* Signal handlers */
- static void sighand_exit(int signum)
- {
--	struct syslog_data sd = SYSLOG_DATA_INIT;
--
--	syslog_r(LOG_INFO, &sd, "%s exiting on signal %d", PROGNAME, signum);
-+	syslog(LOG_INFO, "%s exiting on signal %d", PROGNAME, signum);
- 
- 	_exit(0);
- }
diff --git a/net/pfflowd/files/patch-pfflowd.h b/net/pfflowd/files/patch-pfflowd.h
deleted file mode 100644
index a86f49a5ad1f..000000000000
--- a/net/pfflowd/files/patch-pfflowd.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- pfflowd.h.orig	2008-05-28 12:04:42.000000000 -0700
-+++ pfflowd.h	2008-05-28 12:07:06.000000000 -0700
-@@ -21,7 +21,7 @@
- #define PROGVER                 "0.7"
- 
- #ifndef PRIVDROP_USER
--# define PRIVDROP_USER          "_pfflowd"
-+# define PRIVDROP_USER          "nobody"
- #endif   
- 
- #define PRIVDROP_CHROOT_DIR     "/var/empty"
-@@ -29,7 +29,12 @@
- #define DEFAULT_INTERFACE       "pfsync0"
- #define LIBPCAP_SNAPLEN         2020    /* Default MTU */
-  
--#define _PFSYNC_VER            3
-+#ifdef OLD_PFSYNC
-+# define _PFSYNC_STATE          pfsync_state
-+# define _PFSYNC_VER            2
-+#else
-+# define _PFSYNC_VER            3
-+#endif
- 
- /*
-  * This is the Cisco Netflow(tm) version 1 packet format
diff --git a/net/pfflowd/files/pfflowd.in b/net/pfflowd/files/pfflowd.in
deleted file mode 100644
index 0291ad12a1f8..000000000000
--- a/net/pfflowd/files/pfflowd.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-
-# PROVIDE: pfflowd
-# REQUIRE: LOGIN
-
-#
-# Add the following lines to /etc/rc.conf to enable pfflowd:
-#
-# pfflowd_enable="YES"
-# pfflowd_host="<host>:<port>"
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-
-. /etc/rc.subr
-
-name=pfflowd
-rcvar=pfflowd_enable
-
-load_rc_config $name
-
-# set defaults
-
-pfflowd_enable=${pfflowd_enable:-"NO"}
-pfflowd_host=${pfflowd_host:-"127.0.0.1:2055"}
-
-command=%%PREFIX%%/sbin/pfflowd
-command_args="-n ${pfflowd_host}"
-extra_commands=reload
-
-stop_postcmd=stop_postcmd
-
-stop_postcmd()
-{
-  rm -f $pidfile
-}
-
-pidfile="/var/run/${name}.pid"
-
-run_rc_command "$1"
diff --git a/net/pfflowd/files/pidfile.c b/net/pfflowd/files/pidfile.c
deleted file mode 100644
index 61eca262efe2..000000000000
--- a/net/pfflowd/files/pidfile.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*	$OpenBSD: pidfile.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $	*/
-/*	$NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: pidfile.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <errno.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#if defined(__FreeBSD__)
-#include "pidfile.h"
-#else
-#include <util.h>
-#endif
-
-static char *pidfile_path;
-static pid_t pidfile_pid;
-
-static void pidfile_cleanup(void);
-
-extern char *__progname;
-
-int
-pidfile(const char *basename)
-{
-	FILE *f;
-	int save_errno;
-	pid_t pid;
-
-	if (basename == NULL)
-		basename = __progname;
-
-	if (pidfile_path != NULL) {
-		free(pidfile_path);
-		pidfile_path = NULL;
-	}
-
-	/* _PATH_VARRUN includes trailing / */
-	(void) asprintf(&pidfile_path, "%s%s.pid", _PATH_VARRUN, basename);
-	if (pidfile_path == NULL)
-		return (-1);
-
-	if ((f = fopen(pidfile_path, "w")) == NULL) {
-		save_errno = errno;
-		free(pidfile_path);
-		pidfile_path = NULL;
-		errno = save_errno;
-		return (-1);
-	}
-
-	pid = getpid();
-	if (fprintf(f, "%ld\n", (long)pid) <= 0 || fclose(f) != 0) {
-		save_errno = errno;
-		(void) unlink(pidfile_path);
-		free(pidfile_path);
-		pidfile_path = NULL;
-		errno = save_errno;
-		return (-1);
-	}
-
-	pidfile_pid = pid;
-	if (atexit(pidfile_cleanup) < 0) {
-		save_errno = errno;
-		(void) unlink(pidfile_path);
-		free(pidfile_path);
-		pidfile_path = NULL;
-		pidfile_pid = 0;
-		errno = save_errno;
-		return (-1);
-	}
-
-	return (0);
-}
-
-static void
-pidfile_cleanup(void)
-{
-
-	if (pidfile_path != NULL && pidfile_pid == getpid())
-		(void) unlink(pidfile_path);
-}
diff --git a/net/pfflowd/files/pidfile.h b/net/pfflowd/files/pidfile.h
deleted file mode 100644
index 542325fdcdad..000000000000
--- a/net/pfflowd/files/pidfile.h
+++ /dev/null
@@ -1 +0,0 @@
-int pidfile(const char *);
diff --git a/net/pfflowd/pkg-descr b/net/pfflowd/pkg-descr
deleted file mode 100644
index dbd482d333c2..000000000000
--- a/net/pfflowd/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-pfflowd converts OpenBSD PF status messages (sent via the pfsync interface) to
-Cisco NetFlow datagrams. These datagrams may be sent (via UDP) to a host of
-one's choice. Utilising the OpenBSD stateful packet filter infrastructure means
-that flow tracking is very fast and accurate.
-
-WWW: http://www.mindrot.org/pfflowd.html
diff --git a/net/quagga-re/Makefile b/net/quagga-re/Makefile
deleted file mode 100644
index d85857afc980..000000000000
--- a/net/quagga-re/Makefile
+++ /dev/null
@@ -1,179 +0,0 @@
-# Created by: Sergey Matveychuk <sem@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	quagga
-PORTVERSION=	0.99.17.12
-PORTREVISION=	2
-CATEGORIES=	net ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	quagga-re
-PKGNAMESUFFIX=	-re
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Branch of popular quagga software pointed at stability
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-CONFLICTS=	openbgpd-[0-9]* openospfd-[0-9]* zebra-0* quagga-[0-9]*
-
-USES=			gmake perl5
-USE_AUTOTOOLS=		libtool autoheader
-USE_LDCONFIG=		yes
-USE_PERL5=		build
-BUILD_DEPENDS+=		gawk:${PORTSDIR}/lang/gawk
-LIB_DEPENDS+=		libgcrypt.so:${PORTSDIR}/security/libgcrypt
-CONFIGURE_ARGS+=	--with-libgcrypt
-
-MAN1=		vtysh.1
-MAN8=		bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
-INFO=		quagga
-
-OPTIONS_DEFINE=	ISISD PAM OSPF_NSSA OSPF_OPAQUE_LSA RTADV SNMP TCPSOCKETS \
-		DLMALLOC NO_BGP_ANNOUNCE
-
-ISISD_DESC=		Enable experimental ISIS daemon
-PAM_DESC=		PAM authentication for vtysh
-OSPF_NSSA_DESC=		NSSA support (RFC1587)
-OSPF_OPAQUE_LSA_DESC=	OSPF Opaque-LSA support (RFC2370)
-RTADV_DESC=		IPv6 Router Advertisements
-SNMP_DESC=		SNMP support
-TCPSOCKETS_DESC=	Use TCP/IP sockets for protocol daemons
-DLMALLOC_DESC=		Use dlmalloc (makes bgpd much faster)
-NO_BGP_ANNOUNCE_DESC=	Turn off BGP route announcement
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-CFLAGS+=	-I${LOCALBASE}/include
-.if ${OSVERSION} >= 800000
-LDFLAGS+=	-fstack-protector
-.endif
-CONFIGURE_ARGS+=--includedir=${PREFIX}/include --enable-exampledir=${PREFIX}/share/examples/quagga
-CONFIGURE_ENV+=	LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		LIBTOOL_VERSION=${LIBTOOL_VERSION}
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.if !defined(ENABLE_USER)
-ENABLE_USER=quagga
-.endif
-.if !defined(ENABLE_GROUP)
-ENABLE_GROUP=quagga
-.endif
-
-CONFIGURE_ARGS+=--enable-user=${ENABLE_USER}
-CONFIGURE_ARGS+=--enable-group=${ENABLE_GROUP}
-
-.if !defined(SYSCONF_DIR)
-SYSCONF_DIR=${PREFIX}/etc/quagga
-.endif
-.if !defined(LOCALSTATE_DIR)
-LOCALSTATE_DIR=/var/run/quagga
-.endif
-
-CONFIGURE_ARGS+=--sysconfdir=${SYSCONF_DIR}
-CONFIGURE_ARGS+=--localstatedir=${LOCALSTATE_DIR}
-
-.if defined(ENABLE_VTY_GROUP)
-CONFIGURE_ARGS+=--enable-vty-group=${ENABLE_VTY_GROUP}
-.endif
-
-CONFIGURE_ARGS+=--enable-vtysh
-
-SCRIPTS_ENV=	PREFIX=${PREFIX} PKG_PREFIX=${PREFIX} \
-		SYSCONF_DIR=${SYSCONF_DIR} SYSSTATE_DIR=${SYSSTATE_DIR} \
-		ENABLE_USER=${ENABLE_USER} ENABLE_GROUP=${ENABLE_GROUP}
-
-.if ${PORT_OPTIONS:MISISD}
-CONFIGURE_ARGS+=--enable-isisd
-PLIST_SUB+=	ISISD=""
-.else
-PLIST_SUB+=	ISISD="@comment "
-.endif
-MAN8+=		isisd.8
-
-.if ${PORT_OPTIONS:MPAM}
-CONFIGURE_ARGS+=--with-libpam
-.endif
-
-.if ${PORT_OPTIONS:MOSPFNSSA}
-CONFIGURE_ARGS+=--enable-nssa
-.endif
-
-.if ${PORT_OPTIONS:MOSPF_OPAQUE_LSA}
-CONFIGURE_ARGS+=--enable-opaque-lsa
-PLIST_SUB+=	OSPFAPI=""
-.else
-CONFIGURE_ARGS+=--disable-opaque-lsa
-PLIST_SUB+=	OSPFAPI="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MRTADV}
-CONFIGURE_ARGS+=--enable-rtadv
-.endif
-
-.if ${PORT_OPTIONS:MSNMP}
-CONFIGURE_ARGS+=--enable-snmp
-LIB_DEPENDS+=libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
-.endif
-
-.if ${PORT_OPTIONS:MTCPSOCKETS}
-CONFIGURE_ARGS+=--enable-tcp-zebra
-.endif
-
-.if ${PORT_OPTIONS:MDLMALLOC}
-LIB_DEPENDS+=libdlmalloc.so:${PORTSDIR}/devel/libdlmalloc
-LDFLAGS+=-ldlmalloc
-SUB_LIST=	RCLDCONFIG=ldconfig
-.else
-SUB_LIST=	RCLDCONFIG=
-.endif
-
-.if ${PORT_OPTIONS:MNO_BGP_ANNOUNCE}
-CONFIGURE_ARGS+=--disable-bgp-announce
-.endif
-
-USE_RC_SUBR=	quagga watchquagga
-
-SUB_LIST+=	LOCALSTATE_DIR=${LOCALSTATE_DIR} \
-		SYSCONF_DIR=${SYSCONF_DIR}
-
-PLIST_SUB+=	LOCALSTATE_DIR=${LOCALSTATE_DIR} \
-		SYSCONF_DIR=${SYSCONF_DIR} \
-		ENABLE_USER=${ENABLE_USER} \
-		ENABLE_GROUP=${ENABLE_GROUP}
-
-pre-everything::
-	@${ECHO} "============================================================="
-	@${ECHO}
-	@${ECHO} "You can build ${PORTNAME} with the following options:"
-	@${ECHO}
-	@${ECHO} "ENABLE_USER       Specify user to run Quagga suite as"
-	@${ECHO} "ENABLE_GROUP      Specify group to run Quagga suite as"
-	@${ECHO} "ENABLE_VTY_GROUP  Specify group for vty socket ownership"
-	@${ECHO} "SYSCONF_DIR       Specify directory for Quagga configuration files"
-	@${ECHO} "LOCALSTATE_DIR    Specify directory for Quagga runtime files"
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${ECHO} "===>     installing ${PORTNAME} startup file..."
-	@${ECHO} "Add the following lines to /etc/rc.conf to enable quagga:"
-	@${ECHO} ""
-	@${ECHO} "defaultrouter=\"NO\""
-	@${ECHO} "quagga_enable=\"YES\""
-	@${ECHO} ""
-	@${ECHO} "Also, you may wish to set the following options:"
-	@${ECHO} "quagga_daemons=\"zebra bgpd etc...\""
-	@${ECHO} "quagga_flags=\"....\""
-	@${ECHO} "quagga_extralibs_path=\"/path1 /path2\""
-	@${ECHO} "router_enable=\"NO\""
-	@${ECHO} "watchquagga_enable=\"YES\""
-	@${ECHO} "watchquagga_flags=\"...\""
-	@${ECHO} ""
-
-.if !defined(BATCH)
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/quagga-re/distinfo b/net/quagga-re/distinfo
deleted file mode 100644
index eb3cbfa7b91a..000000000000
--- a/net/quagga-re/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (quagga-0.99.17.12.tar.gz) = fb4166ec4423d288f77b431b3c8a83bce4d53482d0e9da5e9a20b4242eba9280
-SIZE (quagga-0.99.17.12.tar.gz) = 2368300
diff --git a/net/quagga-re/files/quagga.in b/net/quagga-re/files/quagga.in
deleted file mode 100644
index 38c1f014037b..000000000000
--- a/net/quagga-re/files/quagga.in
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# PROVIDE: quagga dynamicrouting
-# REQUIRE: netif routing 
-# KEYWORD: nojail
-
-#
-# Add the following line to /etc/rc.conf to enable quagga:
-#quagga_enable="YES"
-#
-# You may also wish to use the following variables to fine-tune startup:
-#  quagga_flags="-d"
-#  quagga_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd"
-# Per daemon tuning may be done with daemon_name_flags
-#  zebra_flags="-dP 0"
-#  bgpd_flags="-dnrP 0" and so on
-# If you want to give the routing deamons a chance to catchup before
-# continueing, set quagga_wait_for to a "default" or certain prefix.
-#  quagga_wait_for="default"
-#
-# If the quagga daemons require additional shared libraries to start,
-# use the following variable to run ldconfig(8) in advance:
-#quagga_extralibs_path="/usr/local/lib ..."
-#
-
-. /etc/rc.subr
-
-name="quagga"
-rcvar=quagga_enable
-
-start_postcmd=start_postcmd
-stop_postcmd=stop_postcmd
-
-start_postcmd()
-{
-	# Wait only when last daemon has started.
-	if [ "${quagga_daemons}" = "${quagga_daemons% ${name}}" ]; then
-		return;
-	fi
-        if [ ${quagga_wait_for} ]; then
-		echo Waiting for ${quagga_wait_for} route...
-		while true; do
-			/sbin/route -n get ${quagga_wait_for} >/dev/null 2>&1 && break;
-			sleep 1;
-		done
-	fi
-}
-
-stop_postcmd()
-{
-  rm -f $pidfile
-}
-
-do_cmd()
-{
-	local ret
-	ret=0
-	for daemon in ${quagga_daemons}; do
-	    command=%%PREFIX%%/sbin/${daemon}
-	    required_files=%%SYSCONF_DIR%%/${daemon}.conf
-	    pidfile=%%LOCALSTATE_DIR%%/${daemon}.pid
-	    if [ ${quagga_cmd} = "start" -a ! -f ${required_files} ]; then
-			continue
-	    fi
-	    if [ ${quagga_cmd} = "stop" -a -z $(check_process ${command}) ]; then
-			continue
-	    fi
-	    eval flags=\$\{${daemon}_flags:-\"${quagga_flags}\"\}
-	    name=${daemon}
-	    _rc_restart_done=false
-	    run_rc_command "$1" || ret=1
-	done
-	return ${ret}
-}
-
-# set defaults
-
-load_rc_config $name
-
-: ${quagga_enable="NO"}
-: ${quagga_flags="-d"}
-: ${quagga_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd"}
-
-quagga_cmd=$1
-
-case "$1" in
-    force*)
-	quagga_cmd=${quagga_cmd#force}
-	;;
-    fast*)
-	quagga_cmd=${quagga_cmd#fast}
-	;;
-esac
-shift
-
-if [ $# -ge 1 ]; then
-	quagga_daemons="$*"
-fi
-
-case "${quagga_cmd}" in
-    start)
-	if [ ! -z ${quagga_extralibs_path} ]; then
-	    /sbin/ldconfig -m ${quagga_extralibs_path}
-	fi
-	do_cmd "start"
-	;;
-    stop)
-	quagga_daemons=$(reverse_list ${quagga_daemons})
-	do_cmd "stop"
-	;;
-    restart)
-	quagga_daemons=$(reverse_list ${quagga_daemons})
-    	do_cmd "stop"
-	quagga_daemons=$(reverse_list ${quagga_daemons})
-	do_cmd "start"
-	;;
-    *)
-	do_cmd "${quagga_cmd}"
-	;;
-esac
diff --git a/net/quagga-re/files/watchquagga.in b/net/quagga-re/files/watchquagga.in
deleted file mode 100644
index 1b7870f4ebd5..000000000000
--- a/net/quagga-re/files/watchquagga.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# PROVIDE: watchquagga
-# REQUIRE: NETWORKING quagga
-#
-# Add the following line to /etc/rc.conf to enable quagga:
-# watchquagga_enable="YES"
-#
-# You may also wish to use the following variables to fine-tune startup:
-# watchquagga_flags
-#
-#
-
-. /etc/rc.subr
-
-name="watchquagga"
-rcvar=watchquagga_enable
-
-
-stop_postcmd=stop_postcmd
-
-stop_postcmd()
-{
-  rm -f $pidfile
-}
-
-# set defaults
-
-load_rc_config $name
-
-: ${watchquagga_enable="NO"}
-
-command=%%PREFIX%%/sbin/watchquagga
-pidfile=%%LOCALSTATE_DIR%%/watchquagga.pid
-run_rc_command "$1"
diff --git a/net/quagga-re/pkg-descr b/net/quagga-re/pkg-descr
deleted file mode 100644
index a1828f1cd72d..000000000000
--- a/net/quagga-re/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Quagga-RE (Release Engineering) is a process established on the base of
-the well-known Quagga Routing Suite project. The aim of this process is
-to deliver better tested version releases, in the first turn focused on
-OSPF and BGP stability.
-
-WWW: http://sourceforge.net/projects/quagga/files/Quagga-RE/
diff --git a/net/quagga-re/pkg-install b/net/quagga-re/pkg-install
deleted file mode 100644
index 87fe58302cfe..000000000000
--- a/net/quagga-re/pkg-install
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/sbin
-
-if [ -z "${SYSCONF_DIR}" ]; then
-    SYSCONF_DIR=${PKG_PREFIX}/etc/quagga
-fi
-
-if [ -z "${LOCALSTATE_DIR}" ]; then
-    LOCALSTATE_DIR=/var/run/quagga
-fi
-
-if [ -z "${ENABLE_USER}" ]; then
-    ENABLE_USER=quagga
-fi
-
-if [ -z "${ENABLE_GROUP}" ]; then
-    ENABLE_GROUP=quagga
-fi
-
-case $2 in
-    POST-INSTALL)
-	UID=101
-	GID=${UID}
-	if pw group show "${ENABLE_GROUP}" 2>/dev/null; then
-	    echo "You already have a group \"${ENABLE_GROUP}\", so I will use it."
-	else
-	    if pw groupadd ${ENABLE_GROUP} -g ${GID}; then
-		echo "Added group \"${ENABLE_GROUP}\"."
-	    else
-		echo "Adding group \"${ENABLE_GROUP}\" failed."
-		exit 1
-	    fi
-	fi
-	
-	if pw user show "${ENABLE_USER}" 2>/dev/null; then
-		echo "You already have a user \"${ENABLE_USER}\", so I will use it."
-		if pw usermod ${ENABLE_USER} -d ${SYSCONF_DIR}
-		then
-			echo "Changed home directory of \"${ENABLE_USER}\" to \"${SYSCONF_DIR}\""
-		else
-			echo "Changing home directory of \"${ENABLE_USER}\" to \"${SYSCONF_DIR}\" failed..."
-			exit 1
-		fi
-	else
-		if pw useradd ${ENABLE_USER} -u ${UID} -g ${ENABLE_GROUP} -h - \
-			-d ${SYSCONF_DIR} -s /sbin/nologin -c "Quagga Daemon"
-		then
-			echo "Added user \"${ENABLE_USER}\"."
-		else
-			echo "Adding user \"${ENABLE_USER}\" failed..."
-			exit 1
-		fi
-	fi
-
-	mkdir ${LOCALSTATE_DIR}
-	if [ ! -d ${LOCALSTATE_DIR} ]; then
-	    echo "Creating \"${LOCALSTATE_DIR}\" failed."
-	    exit 1
-	fi
-	
-	chown -R ${ENABLE_USER}:${ENABLE_GROUP} ${LOCALSTATE_DIR}
-
-	if [ ! -d ${SYSCONF_DIR} ]; then
-	    mkdir -p ${SYSCONF_DIR}
-	fi
-	
-	if [ ! -d ${SYSCONF_DIR} ]; then
-	    echo "Creating \"${SYSCONF_DIR}\" failed."
-	    exit 1
-	fi
-
-	chown -R ${ENABLE_USER}:${ENABLE_GROUP} ${SYSCONF_DIR}
-	;;
-esac
diff --git a/net/quagga-re/pkg-plist b/net/quagga-re/pkg-plist
deleted file mode 100644
index 99c366e208c1..000000000000
--- a/net/quagga-re/pkg-plist
+++ /dev/null
@@ -1,88 +0,0 @@
-sbin/babeld
-sbin/bgpd
-%%ISISD%%sbin/isisd
-sbin/ospf6d
-%%OSPFAPI%%sbin/ospfclient
-sbin/ospfd
-sbin/ripd
-sbin/ripngd
-sbin/watchquagga
-sbin/zebra
-bin/vtysh
-lib/libospf.a
-lib/libospf.la
-lib/libospf.so
-lib/libospf.so.0
-%%OSPFAPI%%lib/libospfapiclient.a
-%%OSPFAPI%%lib/libospfapiclient.la
-%%OSPFAPI%%lib/libospfapiclient.so
-%%OSPFAPI%%lib/libospfapiclient.so.0
-lib/libzebra.a
-lib/libzebra.la
-lib/libzebra.so
-lib/libzebra.so.0
-include/quagga/buffer.h
-include/quagga/checksum.h
-include/quagga/command.h
-include/quagga/cryptohash.h
-include/quagga/distribute.h
-include/quagga/filter.h
-include/quagga/getopt.h
-include/quagga/hash.h
-include/quagga/if.h
-include/quagga/if_rmap.h
-include/quagga/jhash.h
-include/quagga/keychain.h
-include/quagga/linklist.h
-include/quagga/log.h
-include/quagga/md5.h
-include/quagga/memory.h
-include/quagga/memtypes.h
-include/quagga/network.h
-%%OSPFAPI%%include/quagga/ospfapi/ospf_apiclient.h
-include/quagga/ospfd/ospf_api.h
-include/quagga/ospfd/ospf_asbr.h
-include/quagga/ospfd/ospf_dump.h
-include/quagga/ospfd/ospf_ism.h
-include/quagga/ospfd/ospf_lsa.h
-include/quagga/ospfd/ospf_lsdb.h
-include/quagga/ospfd/ospf_nsm.h
-include/quagga/ospfd/ospf_opaque.h
-include/quagga/ospfd/ospfd.h
-include/quagga/plist.h
-include/quagga/pqueue.h
-include/quagga/prefix.h
-include/quagga/privs.h
-include/quagga/routemap.h
-include/quagga/route_types.h
-include/quagga/sigevent.h
-include/quagga/smux.h
-include/quagga/sockopt.h
-include/quagga/sockunion.h
-include/quagga/str.h
-include/quagga/stream.h
-include/quagga/table.h
-include/quagga/thread.h
-include/quagga/vector.h
-include/quagga/version.h
-include/quagga/vty.h
-include/quagga/workqueue.h
-include/quagga/zassert.h
-include/quagga/zclient.h
-include/quagga/zebra.h
-%%EXAMPLESDIR%%/babeld.conf.sample
-%%EXAMPLESDIR%%/bgpd.conf.sample
-%%EXAMPLESDIR%%/bgpd.conf.sample2
-%%ISISD%%%%EXAMPLESDIR%%/isisd.conf.sample
-%%EXAMPLESDIR%%/ospf6d.conf.sample
-%%EXAMPLESDIR%%/ospfd.conf.sample
-%%EXAMPLESDIR%%/ripd.conf.sample
-%%EXAMPLESDIR%%/ripngd.conf.sample
-%%EXAMPLESDIR%%/vtysh.conf.sample
-%%EXAMPLESDIR%%/zebra.conf.sample
-@dirrm include/quagga/ospfd
-%%OSPFAPI%%@dirrm include/quagga/ospfapi
-@dirrm include/quagga
-@dirrm share/examples/quagga
-@dirrm etc/quagga
-@dirrmtry %%LOCALSTATE_DIR%%
diff --git a/net/rexx-sock/Makefile b/net/rexx-sock/Makefile
deleted file mode 100644
index 8e4f8b3178fa..000000000000
--- a/net/rexx-sock/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Created by: ijliao
-# $FreeBSD$
-
-PORTNAME=	sock
-PORTVERSION=	1.4
-CATEGORIES=	net
-MASTER_SITES=	SF/rx${PORTNAME}/rx${PORTNAME}/${PORTVERSION}
-PKGNAMEPREFIX=	rexx-
-DISTNAME=	RxSock-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Function package for Rexx programmers to create sockets
-
-BUILD_DEPENDS=	rexx-regina>=3.3_1:${PORTSDIR}/lang/rexx-regina
-RUN_DEPENDS=	rexx-regina>=3.3_1:${PORTSDIR}/lang/rexx-regina
-
-USES=		gmake
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
-CONFIGURE_ARGS=	--with-rexx=regina
-MAKE_ARGS=	INSTALL="${INSTALL}"
-USE_LDCONFIG=	yes
-
-DATADIR=	${PREFIX}/share/rx${PORTNAME}
-
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e 's|ld -Bdynamic -Bshareable|$${CC} -shared|g' \
-		${WRKSRC}/configure
-.for file in Makefile.in rxsock-config.in
-	@${REINPLACE_CMD} -e 's|-lc||g' ${WRKSRC}/${file}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/net/rexx-sock/distinfo b/net/rexx-sock/distinfo
deleted file mode 100644
index 2849583847bb..000000000000
--- a/net/rexx-sock/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (RxSock-1.4.tar.gz) = 7eb8a082cb95afb6dadb43eb22b1a074051d4761154f6d19b3e1eb41e0f351ee
-SIZE (RxSock-1.4.tar.gz) = 124168
diff --git a/net/rexx-sock/pkg-descr b/net/rexx-sock/pkg-descr
deleted file mode 100644
index b63bf59406ab..000000000000
--- a/net/rexx-sock/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-RxSock is an external function package for Rexx programmers to enable them to
-connect to, and act as, TCP/IP socket servers.
diff --git a/net/rexx-sock/pkg-plist b/net/rexx-sock/pkg-plist
deleted file mode 100644
index 779a1f361c08..000000000000
--- a/net/rexx-sock/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/rxsock
-lib/librxsock.a
-lib/librxsock.so
-%%DATADIR%%/davesim.rex
-%%DATADIR%%/davesim.txt
-%%DATADIR%%/tcpc.cmd
-%%DATADIR%%/tcps.cmd
-%%DATADIR%%/tcps.txt
-%%DATADIR%%/udpc.cmd
-%%DATADIR%%/udps.cmd
-%%DATADIR%%/udps.txt
-@dirrm %%DATADIR%%
diff --git a/net/ris/Makefile b/net/ris/Makefile
deleted file mode 100644
index e67d55399fea..000000000000
--- a/net/ris/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Created by: Alex Deiter <tiamat@komi.mts.ru>
-# $FreeBSD$
-
-PORTNAME=	ris
-PORTVERSION=	0.4
-CATEGORIES=	net
-MASTER_SITES=	http://oss.netfarm.it/guides/
-DISTNAME=	ris-linux-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	OpenSource alternative to Microsoft Windows RIS
-
-RUN_DEPENDS=	${LOCALBASE}/libexec/in.tftpd:${PORTSDIR}/ftp/tftp-hpa
-
-USE_RC_SUBR=	binlsrv
-USE_PYTHON=	yes
-NO_BUILD=	yes
-
-VARDIR=		/var
-PID_FILE?=	${VARDIR}/run/binlsrv.pid
-LOG_FILE?=	${VARDIR}/log/binlsrv.log
-DEVLIST_CACHE?=	${VARDIR}/db/devlist.cache
-
-SCRIPTS=	binlsrv.py decode.py		\
-		fixloader.py hexdump.py		\
-		infdump.py infparser.py		\
-		modldr.py fixup-repository.sh
-
-
-SUB_FILES=	pkg-message
-SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}	\
-		PID_FILE=${PID_FILE}		\
-		LOG_FILE=${LOG_FILE}		\
-		DEVLIST_CACHE=${DEVLIST_CACHE}
-
-NO_STAGE=	yes
-post-patch:
-.for SCRIPT in ${SCRIPTS}
-	@${REINPLACE_CMD} -e \
-		's|@PYTHON_CMD@|${PYTHON_CMD}|;		\
-		s|@PID_FILE@|${PID_FILE}|;		\
-		s|@LOG_FILE@|${LOG_FILE}|;		\
-		s|@DEVLIST_CACHE@|${DEVLIST_CACHE}|'	\
-		${WRKSRC}/${SCRIPT}
-.endfor
-
-do-install:
-	@${MKDIR} ${DATADIR}/
-	@${MKDIR} ${DATADIR}/inf
-	@${MKDIR} ${DATADIR}/sys
-	@${INSTALL_DATA} ${WRKSRC}/winnt.sif ${DATADIR}/
-	@${INSTALL_DATA} ${FILESDIR}/tftp.map ${DATADIR}/
-.for SCRIPT in ${SCRIPTS}
-	@${INSTALL_SCRIPT} ${WRKSRC}/${SCRIPT} ${DATADIR}/
-.endfor
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/net/ris/distinfo b/net/ris/distinfo
deleted file mode 100644
index 5cc3eed6da91..000000000000
--- a/net/ris/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ris-linux-0.4.tar.gz) = 196c7441f498154d1ae41ef4f1e5107296b7de39f345c763ccce2e913432ae19
-SIZE (ris-linux-0.4.tar.gz) = 21634
diff --git a/net/ris/files/binlsrv.in b/net/ris/files/binlsrv.in
deleted file mode 100644
index 14a76e7b1df6..000000000000
--- a/net/ris/files/binlsrv.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# PROVIDE: binlsrv
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable binlsrv:
-#
-# binlsrv_enable="YES"
-# binlsrv_infdir="/path/to/inf/files"
-
-. /etc/rc.subr
-
-name="binlsrv"
-rcvar=binlsrv_enable
-
-load_rc_config "${name}"
-
-# Set defaults
-: ${binlsrv_enable:="NO"}
-: ${binlsrv_infdir:="%%DATADIR%%/inf"}
-
-pidfile="%%PID_FILE%%"
-command="%%PYTHON_CMD%%"
-command_args="%%DATADIR%%/${name}.py -d"
-required_dirs="$binlsrv_infdir"
-
-start_precmd="binlsrv_start_precmd"
-stop_postcmd="binlsrv_stop_postcmd"
-
-binlsrv_start_precmd()
-{
-	%%DATADIR%%/infparser.py ${binlsrv_infdir}
-}
-
-binlsrv_stop_postcmd()
-{
-	rm -f ${pidfile}
-}
-
-run_rc_command "$1"
diff --git a/net/ris/files/patch-binlsrv.py b/net/ris/files/patch-binlsrv.py
deleted file mode 100644
index 55c1441b783b..000000000000
--- a/net/ris/files/patch-binlsrv.py
+++ /dev/null
@@ -1,32 +0,0 @@
---- binlsrv.py.orig	2007-09-28 19:29:12.000000000 +0400
-+++ binlsrv.py	2010-01-07 18:50:47.218704824 +0300
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#! @PYTHON_CMD@
- # -*- Mode: Python; tab-width: 4 -*-
- #
- # Boot Information Negotiation Layer - OpenSource Implementation
-@@ -40,7 +40,7 @@
-                     [--pid pidfile] [devlist.cache]
- -h, --help     : show this help
- -d, --daemon   : daemonize, unix only [false]
---l, --logfile= : logfile when used in daemon mode [/var/log/binlsrv.log]
-+-l, --logfile= : logfile when used in daemon mode [@LOG_FILE@]
- -a, --address= : ip address to bind to [all interfaces]
- -p, --port=    : port to bind to [4011]
-     --pid=     : pid file to use instead of the default
-@@ -1015,11 +1015,11 @@
-     ## Defaults
-     global pidfile, s
-     daemon  = False
--    logfile = '/var/log/binlsrv.log'
-+    logfile = '@LOG_FILE@'
-     address = ''
-     port    = 4011
--    devfile = 'devlist.cache'
--    pidfile = '/var/run/binlsrv.pid'
-+    devfile = '@DEVLIST_CACHE@'
-+    pidfile = '@PID_FILE@'
- 
-     ## Parse command line arguments
-     shortopts = 'hdl:a:p:'
diff --git a/net/ris/files/patch-decode.py b/net/ris/files/patch-decode.py
deleted file mode 100644
index ebf11236689d..000000000000
--- a/net/ris/files/patch-decode.py
+++ /dev/null
@@ -1,8 +0,0 @@
---- decode.py.orif	Tue Aug  7 16:37:19 2007
-+++ decode.py	Tue Aug  7 16:37:41 2007
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#! @PYTHON_CMD@
- # -*- Mode: Python; tab-width: 4 -*-
- #
- # Boot Information Negotiation Layer Packet decoder
diff --git a/net/ris/files/patch-fixloader.py b/net/ris/files/patch-fixloader.py
deleted file mode 100644
index fafe297ccdaa..000000000000
--- a/net/ris/files/patch-fixloader.py
+++ /dev/null
@@ -1,8 +0,0 @@
---- fixloader.py.orig	Tue Aug  7 16:38:09 2007
-+++ fixloader.py	Tue Aug  7 16:38:22 2007
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#! @PYTHON_CMD@
- # -*- Mode: Python; tab-width: 4 -*-
- #
- # Fix for setuploader
diff --git a/net/ris/files/patch-hexdump.py b/net/ris/files/patch-hexdump.py
deleted file mode 100644
index 927016bbdb28..000000000000
--- a/net/ris/files/patch-hexdump.py
+++ /dev/null
@@ -1,8 +0,0 @@
---- hexdump.py.orig	Tue Aug  7 16:39:44 2007
-+++ hexdump.py	Tue Aug  7 16:39:56 2007
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#! @PYTHON_CMD@
- # -*- Mode: Python; tab-width: 4 -*-
- #
- # Boot Information Negotiation Layer Packet Dumper
diff --git a/net/ris/files/patch-infdump.py b/net/ris/files/patch-infdump.py
deleted file mode 100644
index 1cf8192bca86..000000000000
--- a/net/ris/files/patch-infdump.py
+++ /dev/null
@@ -1,8 +0,0 @@
---- infdump.py.orig	Tue Aug  7 16:40:17 2007
-+++ infdump.py	Tue Aug  7 16:40:51 2007
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#! @PYTHON_CMD@
- # -*- Mode: Python; tab-width: 4 -*-
- #
- # Inf Cache dumper
diff --git a/net/ris/files/patch-infparser.py b/net/ris/files/patch-infparser.py
deleted file mode 100644
index 926bf33d58df..000000000000
--- a/net/ris/files/patch-infparser.py
+++ /dev/null
@@ -1,38 +0,0 @@
---- infparser.py.orig	2010-01-07 20:00:17.171071673 +0300
-+++ infparser.py	2010-01-07 20:02:24.200743110 +0300
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#! @PYTHON_CMD@
- # -*- Mode: Python; tab-width: 4 -*-
- #
- # Inf Driver parser
-@@ -312,28 +312,6 @@
-                 print format_exc()
-                 print '---- CUT HERE ----'
- 
--    print 'Compiled %d drivers' % len(devlist)
--
--    fd = open('devlist.cache', 'wb')
-+    fd = open('@DEVLIST_CACHE@', 'wb')
-     dump(devlist, fd)
-     fd.close()
--    print 'generated devlist.cache'
--
--    fd = open('nics.txt', 'w')
--    drvhash = {}
--    for nic in devlist.items():
--        entry = nic[0].split('&')
--        if len(entry) < 2: continue # just to be sure
--        if not entry[0].startswith('PCI'): continue # skip usb
--        vid = entry[0].split('VEN_').pop().lower()
--        pid = entry[1].split('DEV_').pop().lower()
--        key = (vid, pid)
--        line = '%4s %4s %s %s\n' % (vid, pid, nic[1]['drv'], nic[1]['svc'])
--        drvhash[key] = line
--
--    drvlist = drvhash.values()
--    drvlist.sort()
--    fd.writelines(drvlist)
--    fd.close()
--
--    print 'generated nics.txt'
diff --git a/net/ris/files/patch-modldr.py b/net/ris/files/patch-modldr.py
deleted file mode 100644
index 0246238183a8..000000000000
--- a/net/ris/files/patch-modldr.py
+++ /dev/null
@@ -1,8 +0,0 @@
---- modldr.py.orig	Tue Aug  7 16:41:37 2007
-+++ modldr.py	Tue Aug  7 16:41:50 2007
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#! @PYTHON_CMD@
- # -*- Mode: Python; tab-width: 4 -*-
- #
- # Windows OSLoader Modification Tool
diff --git a/net/ris/files/pkg-message.in b/net/ris/files/pkg-message.in
deleted file mode 100644
index 12abe2643655..000000000000
--- a/net/ris/files/pkg-message.in
+++ /dev/null
@@ -1,15 +0,0 @@
- You can use the following parameters on /etc/rc.conf:
-
- binlsrv_enable (bool): Set to "NO" by default.
-                        Set it to "YES" to enable binlsrv.
-
- binlsrv_infdir (path): Set to "%%DATADIR%%/inf" by default.
-                        Set it to your directory with inf files.
-
- Put all *.inf files into ${binlsrv_infdir} and start binlsrv.
-
- You can use the following parameters on /etc/inetd.conf:
-
- tftp dgram udp wait root %%PREFIX%%/libexec/in.tftpd in.tftpd -v -m %%DATADIR%%/tftp.map -s /tftpboot
-
- See http://oss.netfarm.it/guides/ for more details.
diff --git a/net/ris/files/tftp.map b/net/ris/files/tftp.map
deleted file mode 100644
index ef56e2ed104c..000000000000
--- a/net/ris/files/tftp.map
+++ /dev/null
@@ -1,2 +0,0 @@
-rg \\ /
-r .* \L\0
diff --git a/net/ris/pkg-descr b/net/ris/pkg-descr
deleted file mode 100644
index 83d637ced212..000000000000
--- a/net/ris/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-OpenSource alternative to Microsoft Windows RIS (Remote Installation Services).
-You can also use this stuff to install Microsoft Windows from the network.
-
-WWW: http://oss.netfarm.it/guides/
diff --git a/net/ris/pkg-plist b/net/ris/pkg-plist
deleted file mode 100644
index 38e670814a15..000000000000
--- a/net/ris/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-@stopdaemon binlsrv
-%%DATADIR%%/tftp.map
-%%DATADIR%%/winnt.sif
-%%DATADIR%%/binlsrv.py
-%%DATADIR%%/decode.py
-%%DATADIR%%/fixloader.py
-%%DATADIR%%/hexdump.py
-%%DATADIR%%/infdump.py
-%%DATADIR%%/infparser.py
-%%DATADIR%%/modldr.py
-%%DATADIR%%/fixup-repository.sh
-@exec mkdir -p %D/%%DATADIR%%/inf
-@exec mkdir -p %D/%%DATADIR%%/sys
-@dirrmtry %%DATADIR%%/inf
-@dirrmtry %%DATADIR%%/sys
-@dirrmtry %%DATADIR%%
diff --git a/net/rshell/Makefile b/net/rshell/Makefile
deleted file mode 100644
index da9efa5638f2..000000000000
--- a/net/rshell/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Created by: wosch
-# $FreeBSD$
-
-PORTNAME=	rshell
-PORTVERSION=	1.0
-CATEGORIES=	net
-MASTER_SITES=	http://wolfram.schneider.org/src/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Front end for rsh(1) and rcp(1)
-
-MAN1=		rshell.1
-MLINKS=		rshell.1 rcopy.1
-MANCOMPRESSED=	maybe
-
-NO_STAGE=	yes
-.include <bsd.port.mk>
diff --git a/net/rshell/distinfo b/net/rshell/distinfo
deleted file mode 100644
index 452c9cbf825b..000000000000
--- a/net/rshell/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rshell-1.0.tar.gz) = 9e3e5d3fdd2de5e0ac4a5b320e3e33e1e2af2d6ad5e775b2a7f2385adb5d35ad
-SIZE (rshell-1.0.tar.gz) = 2853
diff --git a/net/rshell/pkg-descr b/net/rshell/pkg-descr
deleted file mode 100644
index 796bdb960077..000000000000
--- a/net/rshell/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION
-     rshell is front end for rsh(1) and rcp(1).  Rshell read the host and
-     username aliases from the configuration file $HOME/.rshellrc with the
-     following syntax:
-
-           alias   <hostname alias> <full hostname>
-
-     or
-
-           alias   <host,host2,...> <email@hostname>
-
-EXAMPLES
-     The following are examples of a typical usage of the rshell command:
-
-           $ rshell foo
-
-     which rshell expand to `rsh -l wosch mail.foobar.com'
-
-           $ rcp foo:/etc/motd .
-
-     which rcopy expand to `rcp wosch@mail.foobar.com:/etc/motd .'
diff --git a/net/rshell/pkg-plist b/net/rshell/pkg-plist
deleted file mode 100644
index 5598c5eb0f55..000000000000
--- a/net/rshell/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/rshell
-share/dot.rshellrc
-@exec ln -f %D/bin/rshell %D/bin/rcopy
-@unexec rm %D/bin/rcopy
diff --git a/net/samba4wins/Makefile b/net/samba4wins/Makefile
deleted file mode 100644
index 3a919fdb2e51..000000000000
--- a/net/samba4wins/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# Created by: Timur I. Bakeyev <timur@gnu.org>
-# $FreeBSD$
-
-PORTNAME=		samba4wins
-PORTVERSION=		1.0.8
-PORTREVISION=		0
-CATEGORIES=		net
-MASTER_SITES=		http://ftp.sernet.de/pub/samba4WINS/debian/pool/
-DISTNAME=		${PORTNAME}_${PORTVERSION}-2
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=		Full featured replicating WINS server for UNIX
-
-CONFLICTS=		ja-samba-2.* ja-samba-4.* samba-2.* samba-4.* sharity-light-1.*
-
-MAKE_JOBS_UNSAFE=	yes
-USES=			iconv perl5
-GNU_CONFIGURE=		yes
-USE_AUTOTOOLS=		autoconf autoheader
-
-WRKSRC=			${WRKDIR}/${PORTNAME}/source
-
-# directories
-VARDIR?=		/var
-S4W_DATADIR=		${PREFIX}/share/${PORTNAME}
-S4W_LOGDIR=		${VARDIR}/log/${PORTNAME}
-S4W_RUNDIR=		${VARDIR}/run
-S4W_LOCKDIR=		${VARDIR}/db/${PORTNAME}
-S4W_PRIVATE=		${S4W_LOCKDIR}/private
-S4W_CONFDIR=		${PREFIX}/etc
-S4W_LIBDIR=		${PREFIX}/lib/${PORTNAME}
-S4W_CONFIG=		${S4W_CONFDIR}/samba4wins.conf
-
-CONFIGURE_ARGS+=	--exec-prefix=${PREFIX} \
-			--datadir=${S4W_DATADIR} \
-	    		--libdir=${S4W_LIBDIR} \
-			--localstatedir=${VARDIR} \
-			--with-privatedir=${S4W_PRIVATE} \
-			--with-lockdir=${S4W_LOCKDIR} \
-			--with-piddir=${S4W_RUNDIR} \
-			--with-logfilebase=${S4W_LOGDIR}
-
-CONFIGURE_ARGS+=	--disable-reg-gconf --disable-socket-wrapper \
-			--with-readline=/usr --with-included-popt \
-			${ICONV_CONFIGURE_BASE} --without-sqlite3 \
-			--without-pthreads --without-python
-
-USE_RC_SUBR=		smbd4wins
-SUB_LIST+=		S4W_RUNDIR=${S4W_RUNDIR}
-
-PLIST_SUB+=		S4W_LOGDIR=${S4W_LOGDIR} \
-			S4W_LOCKDIR=${S4W_LOCKDIR}
-
-INSTALL_TARGET=		showlayout installbin installdat installmisc installlib installpc
-
-NO_STAGE=	yes
-post-build:
-			@for f in ${WRKSRC}/scripting/bin/*; do \
-			    ${REINPLACE_CMD} -i '' -e 's|smbscript|${PREFIX}/bin/smbscript4|' \
-				$${f} && ${MV} $${f} $${f}4; \
-			done
-
-post-install:
-			@${MKDIR} ${S4W_CONFDIR}
-			${INSTALL_DATA} ${FILESDIR}/samba4wins.conf.sample ${S4W_CONFDIR}
-.if !defined(NOPORTDOCS)
-			@${MKDIR} ${DOCSDIR}
-.	for d in HOWTO.txt NEWS.txt README.txt TODO.txt
-			${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/${PORTNAME}-${d} ${DOCSDIR}/${d}
-.	endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/samba4wins/distinfo b/net/samba4wins/distinfo
deleted file mode 100644
index 21755fc54154..000000000000
--- a/net/samba4wins/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (samba4wins_1.0.8-2.tar.gz) = c2953979f1bbc1a097768d8859c570507ce5678ef364ec8f637b660a17dcce30
-SIZE (samba4wins_1.0.8-2.tar.gz) = 7287878
diff --git a/net/samba4wins/files/patch-heimdal_build__config.h b/net/samba4wins/files/patch-heimdal_build__config.h
deleted file mode 100644
index 2014841fb9df..000000000000
--- a/net/samba4wins/files/patch-heimdal_build__config.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./heimdal_build/config.h.orig	2009-01-19 03:15:19.000000000 +0000
-+++ ./heimdal_build/config.h	2009-01-19 04:55:23.000000000 +0000
-@@ -58,6 +58,16 @@
- #define OPENLOG_PROTO_COMPATIBLE
- #define GETSOCKNAME_PROTO_COMPATIBLE
- 
-+#ifndef HAVE_GETPROGNAME
-+#define HAVE_GETPROGNAME
-+#endif
-+#ifndef HAVE_SETPROGNAME
-+#define HAVE_SETPROGNAME
-+#endif
-+#ifndef HAVE___PROGNAME
-+#define HAVE___PROGNAME
-+#endif
-+
- #ifndef HAVE_SOCKLEN_T
- #define HAVE_SOCKLEN_T
- #endif
diff --git a/net/samba4wins/files/patch-lib__ldb__config.mk b/net/samba4wins/files/patch-lib__ldb__config.mk
deleted file mode 100644
index ebe5b5721692..000000000000
--- a/net/samba4wins/files/patch-lib__ldb__config.mk
+++ /dev/null
@@ -1,56 +0,0 @@
---- ./lib/ldb/config.mk.orig	2009-01-14 08:31:07.000000000 +0000
-+++ ./lib/ldb/config.mk	2009-01-19 02:13:34.000000000 +0000
-@@ -179,7 +179,7 @@
- 
- ################################################
- # Start BINARY ldbadd
--[BINARY::ldbadd]
-+[BINARY::ldbadd4]
- INSTALLDIR = BINDIR
- OBJ_FILES = \
- 		tools/ldbadd.o
-@@ -191,7 +191,7 @@
- 
- ################################################
- # Start BINARY ldbdel
--[BINARY::ldbdel]
-+[BINARY::ldbdel4]
- INSTALLDIR = BINDIR
- OBJ_FILES= \
- 		tools/ldbdel.o
-@@ -203,7 +203,7 @@
- 
- ################################################
- # Start BINARY ldbmodify
--[BINARY::ldbmodify]
-+[BINARY::ldbmodify4]
- INSTALLDIR = BINDIR
- OBJ_FILES= \
- 		tools/ldbmodify.o
-@@ -215,7 +215,7 @@
- 
- ################################################
- # Start BINARY ldbsearch
--[BINARY::ldbsearch]
-+[BINARY::ldbsearch4]
- INSTALLDIR = BINDIR
- OBJ_FILES= \
- 		tools/ldbsearch.o
-@@ -227,7 +227,7 @@
- 
- ################################################
- # Start BINARY ldbedit
--[BINARY::ldbedit]
-+[BINARY::ldbedit4]
- INSTALLDIR = BINDIR
- OBJ_FILES= \
- 		tools/ldbedit.o
-@@ -239,7 +239,7 @@
- 
- ################################################
- # Start BINARY ldbrename
--[BINARY::ldbrename]
-+[BINARY::ldbrename4]
- INSTALLDIR = BINDIR
- OBJ_FILES= \
- 		tools/ldbrename.o
diff --git a/net/samba4wins/files/patch-scripting__ejs__config.mk b/net/samba4wins/files/patch-scripting__ejs__config.mk
deleted file mode 100644
index afdb5867e1e2..000000000000
--- a/net/samba4wins/files/patch-scripting__ejs__config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./scripting/ejs/config.mk.orig	2005-12-31 12:13:44.000000000 +0000
-+++ ./scripting/ejs/config.mk	2009-01-19 02:13:34.000000000 +0000
-@@ -37,7 +37,7 @@
- 
- #######################
- # Start BINARY SMBSCRIPT
--[BINARY::smbscript]
-+[BINARY::smbscript4]
- INSTALLDIR = BINDIR
- OBJ_FILES = \
- 		smbscript.o
diff --git a/net/samba4wins/files/patch-torture__config.mk b/net/samba4wins/files/patch-torture__config.mk
deleted file mode 100644
index 03c35e1170f8..000000000000
--- a/net/samba4wins/files/patch-torture__config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./torture/config.mk.orig	2009-01-14 08:31:07.000000000 +0000
-+++ ./torture/config.mk	2009-01-19 02:13:34.000000000 +0000
-@@ -198,7 +198,7 @@
- 
- #################################
- # Start BINARY smbtorture
--[BINARY::smbtorture]
-+[BINARY::smbtorture4]
- INSTALLDIR = BINDIR
- PRIVATE_PROTO_HEADER = torture.h
- OBJ_FILES = \
diff --git a/net/samba4wins/files/patch-utils__config.mk b/net/samba4wins/files/patch-utils__config.mk
deleted file mode 100644
index 3c3019fd73df..000000000000
--- a/net/samba4wins/files/patch-utils__config.mk
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./utils/config.mk.orig	2009-01-14 08:31:07.000000000 +0000
-+++ ./utils/config.mk	2009-01-19 02:13:34.000000000 +0000
-@@ -77,7 +77,7 @@
- 
- #################################
- # Start BINARY nmblookup
--[BINARY::nmblookup]
-+[BINARY::nmblookup4]
- INSTALLDIR = BINDIR
- OBJ_FILES = \
- 		nmblookup.o
-@@ -92,7 +92,7 @@
- 
- #################################
- # Start BINARY testparm
--[BINARY::testparm]
-+[BINARY::testparm4]
- INSTALLDIR = BINDIR
- OBJ_FILES = \
- 		testparm.o
diff --git a/net/samba4wins/files/samba4wins.conf.sample b/net/samba4wins/files/samba4wins.conf.sample
deleted file mode 100644
index d4f52eae6fb1..000000000000
--- a/net/samba4wins/files/samba4wins.conf.sample
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# /usr/local/etc/samba4wins.conf
-#
-# Please read the following files carefully!
-#
-# /usr/local/share/doc/samba4wins/:
-# README.txt
-# NEWS.txt
-# HOWTO.txt
-# TODO.txt
-# 
-
-[globals]
-	# it's important that this netbios name is different from 
-	# the one that's used for samba3!
-	###netbios name = SERVER1-WINS
-	# only use the given interfaces
-	###bind interfaces only = yes
-	# this is the unicast address
-	###interfaces = 192.168.9.2
-	# samba4wins is only a wins server, 
-	# and broadcasts are handled by samba3
-	# so disable listening on the broadcast address
-	###nbtd:disable_broadcast = yes
-
-	# as we want to ourself as wins server
-	# and don't listen on 127.0.0.1
-	# we need to explicit set the wins server here
-	###wins server = 192.168.9.2
diff --git a/net/samba4wins/files/smbd4wins.in b/net/samba4wins/files/smbd4wins.in
deleted file mode 100644
index 68d813c9cdd3..000000000000
--- a/net/samba4wins/files/smbd4wins.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: smbd4wins
-# REQUIRE: NETWORKING SERVERS named ldconfig
-# BEFORE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable smbd:
-#
-#smbd4wins_enable="YES"
-#
-
-. /etc/rc.subr
-
-name="smbd4wins"
-rcvar=smbd4wins_enable
-command="%%PREFIX%%/sbin/${name}"
-pidfile="%%S4W_RUNDIR%%/${name}.pid"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/net/samba4wins/pkg-descr b/net/samba4wins/pkg-descr
deleted file mode 100644
index 5591251fc195..000000000000
--- a/net/samba4wins/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-The Samba4WINS project provides a full featured replicating WINS server
-for UNIX. It is a spinoff of the Samba4 project, the upcoming version of
-the Samba software suite and will also be available as part of the Samba
-suite as soon as Samba4 is released.
-
-WWW: http://enterprisesamba.org/index.php?id=88
diff --git a/net/samba4wins/pkg-plist b/net/samba4wins/pkg-plist
deleted file mode 100644
index a84f499dcf04..000000000000
--- a/net/samba4wins/pkg-plist
+++ /dev/null
@@ -1,50 +0,0 @@
-etc/samba4wins.conf.sample
-bin/nmblookup4
-bin/ldbadd4
-bin/ldbdel4
-bin/ldbedit4
-bin/ldbmodify4
-bin/ldbrename4
-bin/ldbsearch4
-bin/samba3dump4
-bin/smbscript4
-bin/smbstatus4
-bin/smbtorture4
-bin/testparm4
-bin/winreg4
-sbin/smbd4wins
-lib/samba4wins/lowcase.dat
-lib/samba4wins/upcase.dat
-lib/samba4wins/valid.dat
-%%PORTDOCS%%%%DOCSDIR%%/HOWTO.txt
-%%PORTDOCS%%%%DOCSDIR%%/NEWS.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/TODO.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%DATADIR%%/js/auth.js
-%%DATADIR%%/js/base.js
-%%DATADIR%%/js/encoder.js
-%%DATADIR%%/js/management.js
-%%DATADIR%%/js/provision.js
-%%DATADIR%%/js/samr.js
-%%DATADIR%%/js/server_call.js
-%%DATADIR%%/js/upgrade.js
-%%DATADIR%%/js/winreg.js
-%%DATADIR%%/setup/display_specifiers.ldif
-%%DATADIR%%/setup/hklm.ldif
-%%DATADIR%%/setup/provision.ldif
-%%DATADIR%%/setup/provision.smb.conf
-%%DATADIR%%/setup/provision.zone
-%%DATADIR%%/setup/provision_init.ldif
-%%DATADIR%%/setup/provision_templates.ldif
-%%DATADIR%%/setup/provision_users.ldif
-%%DATADIR%%/setup/schema.ldif
-%%DATADIR%%/setup/secrets.ldif
-@dirrm %%DATADIR%%/setup
-@dirrm %%DATADIR%%/js
-@dirrm %%DATADIR%%
-@dirrmtry lib/samba4wins/pkgconfig
-@dirrm lib/samba4wins
-@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %%S4W_LOCKDIR%%/* manually."
-@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %%S4W_LOGDIR%%/* manually."
-@unexec %D/etc/rc.d/samba4wins.sh forcestop 2>/dev/null || true
diff --git a/net/ser/Makefile b/net/ser/Makefile
deleted file mode 100644
index f9b4bf42bdf0..000000000000
--- a/net/ser/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-# Created by: andrei
-# $FreeBSD$
-
-PORTNAME=	ser
-PORTVERSION=	0.9.6
-PORTREVISION=	10
-CATEGORIES=	net
-MASTER_SITES=	http://download.berlios.de/ser/ \
-		http://download2.berlios.de/ser/
-DISTNAME=	${PORTNAME}-${PORTVERSION}_src
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Fast and configurable SIP proxy
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USES=		gmake
-USE_GNOME=	# empty
-USE_RC_SUBR=	ser
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-NOPRECIOUSMAKEVARS=	yes
-
-MAN8=		ser.8
-MAN5=		ser.cfg.5
-MANCOMPRESSED=	no
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if !defined(WITH_SYSTEM_MALLOC)
-MAKE_ENV+=	"extra_defs=-DF_MALLOC -DPKG_MALLOC"
-.endif
-
-.if !defined(WITHOUT_MYSQL)
-USE_MYSQL=	yes
-PLIST_SUB+=	MYSQL=""
-.else
-PLIST_SUB+=	MYSQL="@comment "
-MAKE_ENV+=	MYSQL=mysql
-.endif
-
-.if !defined(WITHOUT_POSTGRESQL)
-USE_PGSQL=	yes
-PLIST_SUB+=	POSTGRESQL=""
-.else
-PLIST_SUB+=	POSTGRESQL="@comment "
-MAKE_ENV+=	POSTGRESQL=postgres
-.endif
-
-.if !defined(WITHOUT_PRESENCE)
-PLIST_SUB+=	PA=""
-USE_GNOME+=	libxml2
-.else
-PLIST_SUB+=	PA="@comment "
-MAKE_ENV+=	PA=pa
-.endif
-
-.if !defined(WITHOUT_RADIUS)
-PLIST_SUB+=	RADIUS=""
-LIB_DEPENDS+=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
-.else
-PLIST_SUB+=	RADIUS="@comment "
-MAKE_ENV+=	RADIUS="auth_radius group_radius uri_radius avp_radius"
-.endif
-
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile completely on ia64, powerpc, or sparc64
-.endif
-
-post-install:
-	${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/modules/acc/etc/radiusclient.conf > \
-			${WRKDIR}/radiusclient.conf
-	${INSTALL_DATA} ${WRKSRC}/modules/acc/etc/sip_dictionary \
-		${PREFIX}/etc/ser
-	${INSTALL_DATA} ${WRKSRC}/modules/acc/etc/servers \
-		${PREFIX}/etc/ser/servers.sample
-	${INSTALL_DATA} ${WRKDIR}/radiusclient.conf \
-		${PREFIX}/etc/ser/radiusclient.conf.default
-	if [ ! -e ${PREFIX}/etc/ser/radiusclient.conf ]; then \
-		${INSTALL_DATA} ${WRKDIR}/radiusclient.conf \
-			${PREFIX}/etc/ser/radiusclient.conf; \
-	fi
-
-.include <bsd.port.post.mk>
diff --git a/net/ser/distinfo b/net/ser/distinfo
deleted file mode 100644
index 5893ec7f6ec6..000000000000
--- a/net/ser/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ser-0.9.6_src.tar.gz) = d7870bdbb753deaa335a9ee0aae1852108fe904f74ed4ba903be9d7cd3a0b140
-SIZE (ser-0.9.6_src.tar.gz) = 1846781
diff --git a/net/ser/files/patch-Makefile b/net/ser/files/patch-Makefile
deleted file mode 100644
index 48110d77f7f0..000000000000
--- a/net/ser/files/patch-Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig
-+++ Makefile
-@@ -46,13 +46,12 @@
- skip_modules?=
- 
- # if not set on the cmd. line or the env, exclude this modules:
--exclude_modules?= 			cpl ext extcmd \
--							postgres snmp \
-+exclude_modules?= 			cpl extcmd \
-+							$(POSTGRESQL) snmp \
- 							im \
--							jabber mysql \
-+							jabber $(MYSQL) \
- 							cpl-c \
--							auth_radius group_radius uri_radius avp_radius \
--							pa
-+							$(RADIUS) $(PA)
- # always exclude the CVS dir
- override exclude_modules+= CVS $(skip_modules)
- 
-@@ -268,7 +267,7 @@
- 		chmod 644 $(cfg-prefix)/$(cfg-dir)ser.cfg.sample
- 		if [ -z "${skip_cfg_install}" -a \
- 				! -f $(cfg-prefix)/$(cfg-dir)ser.cfg ]; then \
--			mv -f $(cfg-prefix)/$(cfg-dir)ser.cfg.sample \
-+			cp $(cfg-prefix)/$(cfg-dir)ser.cfg.sample \
- 				$(cfg-prefix)/$(cfg-dir)ser.cfg; \
- 		fi
- 		# radius dictionary
-@@ -280,10 +279,10 @@
- 		$(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/ser 
- 		$(INSTALL-BIN) ser $(bin-prefix)/$(bin-dir)
- 		$(INSTALL-TOUCH)   $(bin-prefix)/$(bin-dir)/sc
--		$(INSTALL-BIN) scripts/sc $(bin-prefix)/$(bin-dir)
-+		$(INSTALL-SCRIPT) scripts/sc $(bin-prefix)/$(bin-dir)
- 		mv -f $(bin-prefix)/$(bin-dir)/sc $(bin-prefix)/$(bin-dir)/serctl
- 		$(INSTALL-TOUCH)   $(bin-prefix)/$(bin-dir)/ser_mysql.sh  
--		$(INSTALL-BIN) scripts/ser_mysql.sh  $(bin-prefix)/$(bin-dir)
-+		$(INSTALL-SCRIPT) scripts/ser_mysql.sh  $(bin-prefix)/$(bin-dir)
- 		$(INSTALL-TOUCH)   $(bin-prefix)/$(bin-dir)/gen_ha1
- 		$(INSTALL-BIN) utils/gen_ha1/gen_ha1 $(bin-prefix)/$(bin-dir)
- 		$(INSTALL-TOUCH)   $(bin-prefix)/$(bin-dir)/serunix
diff --git a/net/ser/files/patch-Makefile.defs b/net/ser/files/patch-Makefile.defs
deleted file mode 100644
index f8b6bc9538d4..000000000000
--- a/net/ser/files/patch-Makefile.defs
+++ /dev/null
@@ -1,171 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.defs.orig
-+++ Makefile.defs
-@@ -169,10 +169,11 @@
- INSTALL-TOUCH = touch          # used to create the file first (good to 
-                                #  make solaris install work)
- INSTALL-CFG = $(INSTALL) -m 644
--INSTALL-BIN = $(INSTALL) -m 755
--INSTALL-MODULES = $(INSTALL) -m 755
--INSTALL-DOC = $(INSTALL) -m 644
--INSTALL-MAN = $(INSTALL) -m 644
-+INSTALL-BIN = $(BSD_INSTALL_PROGRAM)
-+INSTALL-MODULES = $(BSD_INSTALL_PROGRAM)
-+INSTALL-DOC = $(BSD_INSTALL_MAN)
-+INSTALL-MAN = $(BSD_INSTALL_MAN)
-+INSTALL-SCRIPT = $(BSD_INSTALL_SCRIPT)
- 
- #set some vars from the environment (and not make builtins)
- CC   := $(shell echo "$${CC}")
-@@ -321,14 +322,14 @@
- 	 -DNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
- 	 -DOS='"$(OS)"' -DCOMPILER='"$(CC_VER)"' -D__CPU_$(ARCH) -D__OS_$(OS) \
- 	 -DCFG_DIR='"$(cfg-target)"'\
--	 -DPKG_MALLOC \
- 	 -DSHM_MEM  -DSHM_MMAP \
- 	 -DDNS_IP_HACK \
- 	 -DUSE_IPV6 \
- 	 -DUSE_MCAST \
- 	 -DUSE_TCP \
- 	 -DDISABLE_NAGLE \
--	 -DF_MALLOC \
-+	 #-DPKG_MALLOC \
-+	 #-DF_MALLOC \
- 	 #-DDBG_QM_MALLOC \
- 	 #-DDBG_F_MALLOC \
- 	 #-DNO_DEBUG \
-@@ -464,8 +465,8 @@
- 	found_lock_method=yes
- endif
- 
--CFLAGS=
--LDFLAGS=
-+#CFLAGS=
-+#LDFLAGS=
- # setting CFLAGS
- ifeq ($(mode), release)
- 	#if i386
-@@ -473,15 +474,14 @@
- 		# if gcc 
- ifeq		($(CC_NAME), gcc)
- 				#common stuff
--				CFLAGS=-g -O9 -funroll-loops  -Wcast-align $(PROFILE) \
-+				CFLAGS+=-funroll-loops  -Wcast-align $(PROFILE) \
- 					-Wall  
- 			#if gcc 4.0+
- ifeq			($(CC_SHORTVER), 4.x)
- 					CPU ?= athlon64
- 					CFLAGS+=-minline-all-stringops -malign-double \
- 							-falign-loops \
--							-ftree-vectorize \
--							-mtune=$(CPU) 
-+							-ftree-vectorize
- else
- 			#if gcc 3.4+
- ifeq			($(CC_SHORTVER), 3.4)
-@@ -515,7 +515,7 @@
- 
- else		# CC_NAME, gcc
- ifeq		($(CC_NAME), icc)
--			CFLAGS=-g -O3  -ipo -ipo_obj -unroll  $(PROFILE) \
-+			CFLAGS+=-ipo -ipo_obj -unroll  $(PROFILE) \
- 					 -tpp6 -xK  #-openmp  #optimize for PIII 
- 				# -prefetch doesn't seem to work
- 				#( ty to inline acroos files, unroll loops,prefetch,
-@@ -533,7 +533,7 @@
- 		# if gcc 
- ifeq		($(CC_NAME), gcc)
- 				#common stuff
--				CFLAGS=-g -O9 -funroll-loops  -Wcast-align $(PROFILE) \
-+				CFLAGS+=-funroll-loops  -Wcast-align $(PROFILE) \
- 					-Wall 
- 			#if gcc 4.0+
- ifeq			($(CC_SHORTVER), 4.x)
-@@ -575,7 +575,7 @@
- 
- else		# CC_NAME, gcc
- ifeq		($(CC_NAME), icc)
--			CFLAGS=-g -O3  -ipo -ipo_obj -unroll  $(PROFILE) \
-+			CFLAGS+=-ipo -ipo_obj -unroll  $(PROFILE) \
- 					 -tpp6 -xK  #-openmp  #optimize for PIII 
- 				# -prefetch doesn't seem to work
- 				#( ty to inline acroos files, unroll loops,prefetch,
-@@ -593,7 +593,7 @@
- 			#if gcc
- ifeq		($(CC_NAME), gcc)
- 				#common stuff
--				CFLAGS=-g -O9 -funroll-loops  $(PROFILE) \
-+				CFLAGS+=-funroll-loops  $(PROFILE) \
- 					-Wall\
- 					#-Wcast-align \
- 					#-Wmissing-prototypes 
-@@ -667,7 +667,7 @@
- 		# if gcc 
- ifeq		($(CC_NAME), gcc)
- 				#common stuff
--				CFLAGS=-O9 -funroll-loops  -Wcast-align $(PROFILE) \
-+				CFLAGS+=-funroll-loops  -Wcast-align $(PROFILE) \
- 					-Wall   
- 			#if gcc 4.x+
- ifeq			($(CC_SHORTVER), 4.x)
-@@ -709,7 +709,7 @@
- 		# if gcc 
- ifeq		($(CC_NAME), gcc)
- 				#common stuff
--				CFLAGS=-O9 -funroll-loops  -Wcast-align $(PROFILE) \
-+				CFLAGS+=-funroll-loops  -Wcast-align $(PROFILE) \
- 					-Wall 
- 			#if gcc 4.0+
- ifeq			($(CC_SHORTVER), 4.x)
-@@ -751,7 +751,7 @@
- 		# if gcc 
- ifeq		($(CC_NAME), gcc)
- 				#common stuff
--				CFLAGS= -mips2 -O9 -funroll-loops $(PROFILE) \
-+				CFLAGS+= -mips2 -funroll-loops $(PROFILE) \
- 					-Wall 
- 			#if gcc 4.0+
- ifeq			($(CC_SHORTVER), 4.x)
-@@ -932,7 +932,7 @@
- 	# -andrei
- else	#mode,release
- ifeq	($(CC_NAME), gcc)
--		CFLAGS=-g -Wcast-align $(PROFILE)
-+		CFLAGS+=-Wcast-align $(PROFILE)
- ifeq		($(ARCH), sparc64)
- 			CFLAGS+= -mcpu=ultrasparc 
- endif
-@@ -947,12 +947,12 @@
- endif
- endif
- ifeq	($(CC_NAME), icc)
--		CFLAGS=-g  $(PROFILE)
-+		CFLAGS+=$(PROFILE)
- 		LDFLAGS+=-g -Wl,-E $(PROFILE)
- 		MOD_LDFLAGS=-shared $(LDFLAGS)
- endif
- ifeq	($(CC_NAME), suncc)
--		CFLAGS= -g $(PROFILE)
-+		CFLAGS+= $(PROFILE)
- 		LDFLAGS+=-g $(PROFILE)
- 		MOD_LDFLAGS=-G $(LDFLAGS)
- endif
-@@ -1028,13 +1028,14 @@
- 
- ifeq ($(OS), freebsd)
- 	DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \
--		-DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_CONNECT_ECONNRESET_BUG
-+		-DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_CONNECT_ECONNRESET_BUG \
-+		-I$(LOCALBASE)/include
- 	ifneq ($(found_lock_method), yes)
- 		DEFS+= -DUSE_PTHREAD_MUTEX  # try pthread sems
- 		found_lock_method=yes
- 		LIBS= -pthread -lfl  #dlopen is in libc
- 	else
--		LIBS= -lfl  #dlopen is in libc
-+		LIBS= -lfl -L$(LOCALBASE)/lib #dlopen is in libc
- 	endif
- 	YACC=yacc
- endif
diff --git a/net/ser/files/patch-Makefile.rules b/net/ser/files/patch-Makefile.rules
deleted file mode 100644
index 2df91d4f6265..000000000000
--- a/net/ser/files/patch-Makefile.rules
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.rules
-+++ Makefile.rules
-@@ -18,7 +18,7 @@
- 	$(CC) $(CFLAGS) $(DEFS) -c $< -o $@
- 
- %.d: %.c $(ALLDEP)
--	@set -e; $(MKDEP) $(DEFS) $< \
-+	@set -e; $(MKDEP) $(CFLAGS) $(DEFS) $< \
- 	|  sed 's#\(\($*D)\)\?$(*F)\)\.o[ :]*#$*.o $@ : #g' > $@; \
- 	[ -s $@ ] || rm -f $@
- 
diff --git a/net/ser/files/patch-cfg.lex b/net/ser/files/patch-cfg.lex
deleted file mode 100644
index ddfe015b190b..000000000000
--- a/net/ser/files/patch-cfg.lex
+++ /dev/null
@@ -1,21 +0,0 @@
-
-$FreeBSD$
-
---- cfg.lex	2004/06/29 19:08:42	1.1
-+++ cfg.lex	2004/06/29 19:10:36
-@@ -165,6 +165,7 @@
- FIFO fifo
- FIFO_MODE fifo_mode
- SERVER_SIGNATURE server_signature
-+SERVER_NAME server_name
- REPLY_TO_VIA reply_to_via
- USER		"user"|"uid"
- GROUP		"group"|"gid"
-@@ -332,6 +333,7 @@
- <INITIAL>{FIFO}	{ count(); yylval.strval=yytext; return FIFO; }
- <INITIAL>{FIFO_MODE}	{ count(); yylval.strval=yytext; return FIFO_MODE; }
- <INITIAL>{SERVER_SIGNATURE}	{ count(); yylval.strval=yytext; return SERVER_SIGNATURE; }
-+<INITIAL>{SERVER_NAME}	{ count(); yylval.strval=yytext; return SERVER_NAME; }
- <INITIAL>{REPLY_TO_VIA}	{ count(); yylval.strval=yytext; return REPLY_TO_VIA; }
- <INITIAL>{ADVERTISED_ADDRESS}	{	count(); yylval.strval=yytext;
- 									return ADVERTISED_ADDRESS; }
diff --git a/net/ser/files/patch-cfg.y b/net/ser/files/patch-cfg.y
deleted file mode 100644
index 87a917abe8ae..000000000000
--- a/net/ser/files/patch-cfg.y
+++ /dev/null
@@ -1,21 +0,0 @@
-
-$FreeBSD$
-
---- cfg.y.orig
-+++ cfg.y
-@@ -210,6 +210,7 @@
- %token UNIX_SOCK_CHILDREN
- %token UNIX_TX_TIMEOUT
- %token SERVER_SIGNATURE
-+%token SERVER_NAME
- %token REPLY_TO_VIA
- %token LOADMODULE
- %token MODPARAM
-@@ -610,6 +611,7 @@
- 		| TLS_SEND_TIMEOUT EQUAL error { yyerror("number expected"); }
- 		| SERVER_SIGNATURE EQUAL NUMBER { server_signature=$3; }
- 		| SERVER_SIGNATURE EQUAL error { yyerror("boolean value expected"); }
-+		| SERVER_NAME EQUAL STRING { server_name=$3; }
- 		| REPLY_TO_VIA EQUAL NUMBER { reply_to_via=$3; }
- 		| REPLY_TO_VIA EQUAL error { yyerror("boolean value expected"); }
- 		| LISTEN EQUAL id_lst {
diff --git a/net/ser/files/patch-config.h b/net/ser/files/patch-config.h
deleted file mode 100644
index 1a8259c87b8d..000000000000
--- a/net/ser/files/patch-config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- config.h	2004/06/29 19:14:46	1.1
-+++ config.h	2004/06/29 19:33:41
-@@ -72,12 +72,14 @@
- #define CONTENT_LENGTH "Content-Length: "
- #define CONTENT_LENGTH_LEN (sizeof(CONTENT_LENGTH)-1)
- 
--#define USER_AGENT "User-Agent: Sip EXpress router"\
-+#define UA_NAME "Sip EXpress router "\
- 		"(" VERSION " (" ARCH "/" OS"))"
-+#define UA_NAME_LEN (sizeof(UA_NAME)-1)
-+
-+#define USER_AGENT "User-Agent: "
- #define USER_AGENT_LEN (sizeof(USER_AGENT)-1)
- 
--#define SERVER_HDR "Server: Sip EXpress router "\
--		"(" VERSION " (" ARCH "/" OS"))"
-+#define SERVER_HDR "Server: "
- #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1)
- 
- #define MAX_WARNING_LEN  256
diff --git a/net/ser/files/patch-daemonize.c b/net/ser/files/patch-daemonize.c
deleted file mode 100644
index 88cd832a0ecc..000000000000
--- a/net/ser/files/patch-daemonize.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- daemonize.c
-+++ daemonize.c
-@@ -198,7 +198,7 @@
- 	}
- 	
- 	if (log_stderr==0)
--		openlog(name, LOG_PID|LOG_CONS, log_facility);
-+		openlog(name, LOG_PID, log_facility);
- 		/* LOG_CONS, LOG_PERRROR ? */
- 
- 	return  0;
diff --git a/net/ser/files/patch-fifo_server.c b/net/ser/files/patch-fifo_server.c
deleted file mode 100644
index 39b5a3647054..000000000000
--- a/net/ser/files/patch-fifo_server.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- fifo_server.c.orig	Sat Nov  1 20:56:58 2003
-+++ fifo_server.c	Tue Jun 29 22:33:53 2004
-@@ -642,7 +657,7 @@
- static int print_version_cmd( FILE *stream, char *response_file )
- {
- 	if (response_file) {
--		fifo_reply(response_file, "200 ok\n" SERVER_HDR CRLF );
-+		fifo_reply(response_file, "200 ok\n" SERVER_HDR "%s" CRLF, server_name ? server_name : UA_NAME );
- 	} else {
- 		LOG(L_ERR, "ERROR: no file for %s\n", "print_version_cmd" );
- 	}
diff --git a/net/ser/files/patch-globals.h b/net/ser/files/patch-globals.h
deleted file mode 100644
index 0b19a234716a..000000000000
--- a/net/ser/files/patch-globals.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- globals.h	2004/06/29 19:08:42	1.1
-+++ globals.h	2004/06/29 19:30:58
-@@ -91,6 +91,7 @@
- /* extern int process_no; */
- extern int sip_warning;
- extern int server_signature;
-+extern char* server_name;
- extern char* user;
- extern char* group;
- extern char* chroot_dir;
diff --git a/net/ser/files/patch-main.c b/net/ser/files/patch-main.c
deleted file mode 100644
index 00ef167417fd..000000000000
--- a/net/ser/files/patch-main.c
+++ /dev/null
@@ -1,24 +0,0 @@
-
-$FreeBSD$
-
---- main.c.orig
-+++ main.c
-@@ -251,6 +251,10 @@
-    be default yes, good for trouble-shooting
- */
- int server_signature=1;
-+/*
-+ * Server's signature if different from default.
-+ */
-+char* server_name = 0;
- /* should ser try to locate outbound interface on multihomed
-  * host? by default not -- too expensive
-  */
-@@ -350,6 +354,7 @@
- void cleanup(show_status)
- {
- 	/*clean-up*/
-+	setlogmask(LOG_UPTO(LOG_INFO));
- 	if (mem_lock) 
- 		shm_unlock(); /* hack: force-unlock the shared memory lock in case
- 					 some process crashed and let it locked; this will 
diff --git a/net/ser/files/patch-mem__mem.h b/net/ser/files/patch-mem__mem.h
deleted file mode 100644
index 81e7c3d59e99..000000000000
--- a/net/ser/files/patch-mem__mem.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- mem/mem.h.orig
-+++ mem/mem.h
-@@ -122,9 +122,13 @@
- #else
- #	include <stdlib.h>
- #	define pkg_malloc(s) \
--	(  { void *v; v=malloc((s)); \
--	   DBG("malloc %p size %d end %p\n", v, s, (char*)v+(s));\
--	   v; } )
-+	(  { void *____v123; ____v123=malloc((s)); \
-+	   DBG("malloc %p size %lu end %p\n", ____v123, (unsigned long)(s), (char*)____v123+(s));\
-+	   ____v123; } )
-+#	define pkg_realloc(p, s) \
-+	(  { void *____v123; ____v123=realloc(p, s); \
-+	   DBG("realloc %p size %lu end %p\n", ____v123, (unsigned long)(s), (char*)____v123+(s));\
-+	    ____v123; } )
- #	define pkg_free(p)  do{ DBG("free %p\n", (p)); free((p)); }while(0);
- #	define pkg_status()
- #endif
diff --git a/net/ser/files/patch-modules__acc__acc_mod.c b/net/ser/files/patch-modules__acc__acc_mod.c
deleted file mode 100644
index 59df9ddd442d..000000000000
--- a/net/ser/files/patch-modules__acc__acc_mod.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- modules/acc/acc_mod.c.orig	Mon Jul 19 01:56:23 2004
-+++ modules/acc/acc_mod.c	Tue Jul 27 21:01:36 2004
-@@ -93,7 +93,7 @@
- int log_level=L_NOTICE;
- char *log_fmt=DEFAULT_LOG_FMT;
- #ifdef RAD_ACC
--static char *radius_config = "/usr/local/etc/radiusclient/radiusclient.conf";
-+static char *radius_config = (CFG_DIR "radiusclient.conf");
- int radius_flag = 0;
- int radius_missed_flag = 0;
- static int service_type = -1;
diff --git a/net/ser/files/patch-modules__acc__etc__radiusclient.conf b/net/ser/files/patch-modules__acc__etc__radiusclient.conf
deleted file mode 100644
index 3d13a5648be6..000000000000
--- a/net/ser/files/patch-modules__acc__etc__radiusclient.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-
-$FreeBSD$
-
---- modules/acc/etc/radiusclient.conf	2003/07/06 17:56:08	1.1
-+++ modules/acc/etc/radiusclient.conf	2003/07/06 17:57:54
-@@ -22,7 +22,7 @@
- 
- # name of the issue file. it's only display when no username is passed
- # on the radlogin command line
--issue	/usr/local/etc/radiusclient/issue
-+issue	%%LOCALBASE%%/etc/radiusclient-ng/issue
- 
- # RADIUS settings
- 
-@@ -44,23 +44,23 @@
- 
- # file holding shared secrets used for the communication
- # between the RADIUS client and server
--servers		/home/jiri/sip_router/modules/acc/etc/servers
-+servers		%%PREFIX%%/etc/ser/servers
- 
- 
- 
- # dictionary of allowed attributes and values
- # just like in the normal RADIUS distributions
--dictionary 	/home/jiri/sip_router/modules/acc/etc/sip_dictionary
-+dictionary 	%%PREFIX%%/etc/ser/sip_dictionary
- 
- # program to call for a RADIUS authenticated login
--login_radius	/usr/local/sbin/login.radius
-+login_radius	%%LOCALBASE%%/sbin/login.radius
- 
- # file which holds sequence number for communication with the
- # RADIUS server
- seqfile		/var/run/radius.seq
- 
- # file which specifies mapping between ttyname and NAS-Port attribute
--mapfile		/usr/local/etc/radiusclient/port-id-map
-+mapfile		%%LOCALBASE%%/etc/radiusclient-ng/port-id-map
- 
- # default authentication realm to append to all usernames if no
- # realm was explicitly specified by the user
diff --git a/net/ser/files/patch-modules__auth__auth_mod.c b/net/ser/files/patch-modules__auth__auth_mod.c
deleted file mode 100644
index 2d08c8f5edff..000000000000
--- a/net/ser/files/patch-modules__auth__auth_mod.c
+++ /dev/null
@@ -1,60 +0,0 @@
-
-$FreeBSD$
-
---- modules/auth/auth_mod.c.orig
-+++ modules/auth/auth_mod.c
-@@ -84,6 +84,9 @@
- int (*sl_reply)(struct sip_msg* _msg, char* _str1, char* _str2);
- 
- 
-+struct tm_binds tmb;
-+
-+
- /*
-  * Module parameter variables
-  */
-@@ -93,6 +96,7 @@
- str secret;
- char* sec_rand = 0;
- 
-+int use_tm = 0;
- 
- /*
-  * Default Remote-Party-ID prefix
-@@ -140,6 +144,7 @@
- 	{"rpid_prefix",  STR_PARAM, &rpid_prefix_param },
- 	{"rpid_suffix",  STR_PARAM, &rpid_suffix_param },
- 	{"realm_prefix", STR_PARAM, &realm_prefix_param},
-+	{"use_tm",       INT_PARAM, &use_tm            },
- 	{0, 0, 0}
- };
- 
-@@ -190,13 +195,23 @@
- 
- static int mod_init(void)
- {
-+	load_tm_f load_tm;
-+
- 	DBG("auth module - initializing\n");
--	
--	sl_reply = find_export("sl_send_reply", 2, 0);
- 
--	if (!sl_reply) {
--		LOG(L_ERR, "auth:mod_init(): This module requires sl module\n");
--		return -2;
-+	if (use_tm != 0) {
-+		load_tm = (load_tm_f)find_export("load_tm", NO_SCRIPT, 0);
-+		if (load_tm == NULL || load_tm(&tmb) == -1) {
-+			LOG(L_ERR, "Can't import tm\n");
-+			return -1;
-+		}
-+	} else {
-+		sl_reply = find_export("sl_send_reply", 2, 0);
-+
-+		if (!sl_reply) {
-+			LOG(L_ERR, "auth:mod_init(): This module requires sl module\n");
-+			return -2;
-+		}
- 	}
- 
- 	     /* If the parameter was not used */
diff --git a/net/ser/files/patch-modules__auth__auth_mod.h b/net/ser/files/patch-modules__auth__auth_mod.h
deleted file mode 100644
index 8d3304af4139..000000000000
--- a/net/ser/files/patch-modules__auth__auth_mod.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-$FreeBSD$
-
---- modules/auth/auth_mod.h.orig
-+++ modules/auth/auth_mod.h
-@@ -36,7 +36,7 @@
- 
- #include "../../str.h"
- #include "../../parser/msg_parser.h"    /* struct sip_msg */
--
-+#include "../tm/tm_load.h"
- 
- /*
-  * Module parameters variables
-@@ -46,9 +46,11 @@
- extern str rpid_prefix;       /* Remote-Party-ID prefix */
- extern str rpid_suffix;       /* Remote-Party-ID suffix */
- extern str realm_prefix;      /* strip off auto-generated realm */
--
-+extern int use_tm;
- 
- /* Stateless reply function pointer */
- extern int (*sl_reply)(struct sip_msg* _m, char* _str1, char* _str2);
-+
-+extern struct tm_binds tmb;
- 
- #endif /* AUTH_MOD_H */
diff --git a/net/ser/files/patch-modules__auth__common.c b/net/ser/files/patch-modules__auth__common.c
deleted file mode 100644
index d15db240bedc..000000000000
--- a/net/ser/files/patch-modules__auth__common.c
+++ /dev/null
@@ -1,12 +0,0 @@
-
-$FreeBSD$
-
---- modules/auth/common.c.orig
-+++ modules/auth/common.c
-@@ -95,5 +95,5 @@
- 		}
- 	}
- 
--	return sl_reply(_m, (char*)(long)_code, _reason);
-+	return (use_tm != 0) ? tmb.t_reply(_m, _code, _reason) : sl_reply(_m, (char*)(long)_code, _reason);
- }
diff --git a/net/ser/files/patch-modules__auth__doc__auth_user.sgml b/net/ser/files/patch-modules__auth__doc__auth_user.sgml
deleted file mode 100644
index c67c487a48e2..000000000000
--- a/net/ser/files/patch-modules__auth__doc__auth_user.sgml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-$FreeBSD$
-
---- modules/auth/doc/auth_user.sgml
-+++ modules/auth/doc/auth_user.sgml
-@@ -33,7 +33,10 @@
- 	    must be loaded before this module):
- 	    <itemizedlist>
- 		<listitem>
--		    <para><emphasis>sl</emphasis> -- Stateless replies</para>
-+		    <para><emphasis>sl</emphasis> -- Stateless replies (if <varname>use_tm</varname> is 0)</para>
-+		</listitem>
-+		<listitem>
-+		    <para><emphasis>tm</emphasis> -- Transaction module (if <varname>use_tm</varname> is 1)</para>
- 		</listitem>
- 	    </itemizedlist>
- 	</para>
-@@ -103,6 +106,26 @@
- 		<title>rpid_suffix</title>
- 		<programlisting format="linespecific">
- modparam("auth", "rpid_suffix", "@1.2.3.4>")
-+</programlisting>
-+	    </example>
-+	</section>
-+	<section>
-+	    <title><varname>use_tm</varname> (integer)</title>
-+	    <para>
-+		If set to 1 then the auth will use <function>t_reply()</function> function from
-+		the tm module instead of <function>sl_send_reply()</function> function from the
-+		sl module for sending replies.  This allows challenge responses to be processes
-+		statefully if necessary.  When set to 1 script writer need to ensure that transaction
-+		exists when <function>www_challenge()</function> or <function>proxy_challenge()</function>
-+		is called, usually by calling <function>t_newtran()</function>.
-+	    </para>
-+	    <para>
-+		Default value is 0.
-+	    </para>
-+	    <example>
-+		<title>use_tm example</title>
-+		<programlisting format="linespecific">
-+modparam("auth", "use_tm", 1)
- </programlisting>
- 	    </example>
- 	</section>
diff --git a/net/ser/files/patch-modules__auth_radius__authrad_mod.c b/net/ser/files/patch-modules__auth_radius__authrad_mod.c
deleted file mode 100644
index faf1196f43ea..000000000000
--- a/net/ser/files/patch-modules__auth_radius__authrad_mod.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- modules/auth_radius/authrad_mod.c.orig
-+++ modules/auth_radius/authrad_mod.c
-@@ -69,7 +69,7 @@
- /*
-  * Module parameter variables
-  */
--static char* radius_config = "/usr/local/etc/radiusclient/radiusclient.conf";
-+static char* radius_config = (CFG_DIR "radiusclient.conf");
- static int service_type = -1;
- 
- 
diff --git a/net/ser/files/patch-modules__check_ua__Makefile b/net/ser/files/patch-modules__check_ua__Makefile
deleted file mode 100644
index c851e5e6168f..000000000000
--- a/net/ser/files/patch-modules__check_ua__Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-
-$FreeBSD$
-
---- modules/check_ua/Makefile.orig
-+++ modules/check_ua/Makefile
-@@ -0,0 +1,13 @@
-+# $Id: patch-modules::check_ua::Makefile,v 1.2 2005/04/05 13:10:07 netch Exp $
-+#
-+# example module makefile
-+#
-+# 
-+# WARNING: do not run this directly, it should be run by the master Makefile
-+
-+include ../../Makefile.defs
-+auto_gen=
-+NAME=check_ua.so
-+LIBS= 
-+
-+include ../../Makefile.modules
diff --git a/net/ser/files/patch-modules__check_ua__check_ua.c b/net/ser/files/patch-modules__check_ua__check_ua.c
deleted file mode 100644
index 2b70a6d83c8d..000000000000
--- a/net/ser/files/patch-modules__check_ua__check_ua.c
+++ /dev/null
@@ -1,374 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Sun Jan  9 11:17:56 2005
-+++ modules/check_ua/check_ua.c	Sun Jan  9 11:17:26 2005
-@@ -0,0 +1,368 @@
-+/*
-+ * $Id: patch-modules::check_ua::check_ua.c,v 1.2 2005/04/05 13:10:07 netch Exp $
-+ *
-+ * CHECK_UA module
-+ *
-+ *
-+ * Copyright (C) 2004-2005 Porta Software Ltd.
-+ * Copyright (C) Valentin Nechayev <netch@portaone.com>
-+ *
-+ * This file is part of ser, a free SIP server.
-+ *
-+ * ser is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version
-+ *
-+ * For a license to use the ser software under conditions
-+ * other than those described here, or to purchase support for this
-+ * software, please contact iptel.org by e-mail at the following addresses:
-+ *    info@iptel.org
-+ *
-+ * ser is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+/* History:
-+ * --------
-+ * 2004-12-15 initial version (netch)
-+ *
-+ * 2005-01-09 style(9) and other minor nits (sobomax, netch)
-+ */
-+
-+
-+#include <sys/types.h>
-+#include <regex.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#include "../../db/db.h"
-+#include "../../db/db_val.h"
-+#include "../../dprint.h"
-+#include "../../error.h"
-+#include "../../flags.h"
-+#include "../../mem/mem.h"
-+#include "../../sr_module.h"
-+
-+#include "tailq.h"
-+
-+MODULE_VERSION
-+
-+static int check_ua_init(void);
-+static int check_ua_exit(void);
-+static int check_ua_f(struct sip_msg *, char *, char *);
-+static int child_init(int);
-+
-+/* parameters */
-+
-+/* global variables */
-+
-+int  check_ua_f(struct sip_msg *, char *, char *);
-+
-+static cmd_export_t cmds[]={
-+	{"check_ua", check_ua_f, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE},
-+	{0, 0, 0, 0, 0}
-+};
-+
-+static char *db_url = NULL;
-+static char *db_table = NULL;
-+static db_con_t *db_handle;
-+static int reread_interval = 300;
-+
-+static param_export_t params[]={
-+	{"db_url",	STR_PARAM,	&db_url},
-+	{"db_table",	STR_PARAM,	&db_table},
-+	{"reread_interval",	INT_PARAM,	&reread_interval},
-+	{0, 0, 0}
-+};
-+
-+struct module_exports exports= {
-+	"check_ua",
-+	cmds,
-+	params,
-+
-+	check_ua_init,   /* module initialization function */
-+	(response_function) 0,
-+	(destroy_function) check_ua_exit,   /* module exit function */
-+	0,
-+	child_init  /* per-child init function */
-+};
-+
-+typedef struct reglist_entry {
-+	TAILQ_ENTRY(reglist_entry)	re_link;
-+	char				*re_regexp;
-+	regex_t				re_compiled;
-+	int				re_has_compiled;
-+	int				re_flag_num;
-+} reglist_entry;
-+
-+static TAILQ_HEAD(reglist_head_t, reglist_entry) reglist;
-+typedef struct reglist_head_t reglist_head_t;
-+
-+static time_t last_got;
-+
-+static void reglist_entry_free(reglist_entry *);
-+static int load_reglist(reglist_head_t *);
-+static void check_ua_periodic(void);
-+static str *getUserAgent(struct sip_msg *msg);
-+
-+static db_func_t db_functions;
-+
-+static int
-+check_ua_init(void)
-+{
-+
-+	LOG(L_INFO,"CHECK_UA - initializing\n");
-+	if (bind_dbmod(db_url, &db_functions) != 0) {
-+		LOG(L_ERR, "CHECK_UA: init: bind_dbmod() failed\n");
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+static int
-+child_init(int child)
-+{
-+
-+	TAILQ_INIT(&reglist);
-+	db_handle = db_functions.init(db_url);
-+	if (!db_handle) {
-+		LOG(L_ERR, "CHECK_UA: cannot connect to database\n");
-+		return -1;
-+	}
-+	if (load_reglist(&reglist) < 0)
-+		return -1;
-+	time(&last_got);
-+	srand(time(NULL) + getpid());
-+	return 0;
-+}
-+
-+static int
-+check_ua_exit(void)
-+{
-+
-+	reglist_entry *re;
-+	LOG(L_INFO, "CHECK_UA - destroing module\n");
-+
-+	/* Free reglist */
-+	while ((re = TAILQ_FIRST(&reglist)) != NULL) {
-+		TAILQ_REMOVE(&reglist, re, re_link);
-+		reglist_entry_free(re);
-+	}
-+
-+	return 0;
-+}
-+
-+static int
-+load_reglist_sub(reglist_head_t *head)
-+{
-+
-+	db_key_t cols[2];
-+	db_res_t *db_res;
-+	reglist_entry *re;
-+	int i;
-+	int ret;
-+
-+	ret = -1;
-+	if (db_functions.use_table(db_handle, db_table) < 0) {
-+		LOG(L_ERR, "check_ua: load_reglist(): can't select table\n");
-+		return -1;
-+	}
-+	cols[0] = "rexp";
-+	cols[1] = "flag";
-+	if (db_functions.query(db_handle, NULL, NULL, NULL, cols, 0, 2, NULL, &db_res) < 0) {
-+		LOG(L_ERR, "check_ua: load_reglist(): query failed\n");
-+		return -1;
-+	}
-+	/* Iterate result */
-+	for (i = 0; i < RES_ROW_N(db_res); ++i) {
-+		db_row_t *row = &RES_ROWS(db_res)[i];
-+		db_val_t *val_regexp;
-+		db_val_t *val_flag;
-+		char *r;
-+		int flags;
-+		str t;
-+
-+		if (row->n != 2) {
-+			LOG(L_ERR, "check_ua: load_reglist(): no required columns\n");
-+			goto cleanup;
-+		}
-+		val_regexp = &ROW_VALUES(row)[0];
-+		val_flag = &ROW_VALUES(row)[1];
-+		re = pkg_malloc(sizeof(*re));
-+		if (re == NULL) {
-+			LOG(L_ERR, "ERROR: check_ua: load_reglist(): no memory\n");
-+			goto cleanup;
-+		}
-+		memset(re, '\0', sizeof(*re));
-+		/* First is weight, either absolute or accumulated */
-+		re->re_flag_num = VAL_INT(val_flag);
-+		if (VAL_TYPE(val_regexp) == DB_STRING) {
-+			t.s = (char *)VAL_STRING(val_regexp);
-+			t.len = strlen(t.s);
-+		} else if (VAL_TYPE(val_regexp) == DB_STR) {
-+			t = VAL_STR(val_regexp);
-+		} else {
-+			LOG(L_ERR, "ERROR: check_ua: load_reglist(): invalid value type\n");
-+			goto cleanup;
-+		}
-+		re->re_regexp = pkg_malloc(t.len + 1);
-+		if (re->re_regexp == NULL)  {
-+			LOG(L_ERR, "ERROR: check_ua: load_reglist(): no memory\n");
-+			goto cleanup;
-+		}
-+		memcpy(re->re_regexp, t.s, t.len);
-+		re->re_regexp[t.len] = '\0';
-+		flags = REG_EXTENDED;
-+		r = re->re_regexp;
-+		if (strncmp(r, "\\c", 2) == 0) {
-+			r += 2;
-+			flags |= REG_ICASE;
-+		}
-+		if (regcomp(&re->re_compiled, r, flags) != 0) {
-+			LOG(L_ERR, "ERROR: check_ua: load_reglist(): regcomp() failed\n");
-+			reglist_entry_free(re);
-+			goto cleanup;
-+		}
-+		re->re_has_compiled = 1;
-+		TAILQ_INSERT_TAIL(head, re, re_link);
-+	}
-+	ret = 0;
-+cleanup:
-+	db_functions.free_result(db_handle, db_res);
-+	return ret;
-+}
-+
-+static int
-+load_reglist(reglist_head_t *head)
-+{
-+	reglist_entry *re;
-+	int rc;
-+
-+	rc = load_reglist_sub(head);
-+	if (rc < 0) {
-+		/* Free list. This is too hard to add in subfunction. */
-+		while ((re = TAILQ_FIRST(head)) != NULL) {
-+			TAILQ_REMOVE(head, re, re_link);
-+			reglist_entry_free(re);
-+		}
-+	}
-+	return rc;
-+}
-+
-+static int
-+check_ua_f(struct sip_msg *msg, char *dummy1, char *dummy2)
-+{
-+	str *useragent_str;
-+	char *ua;
-+	reglist_entry *re;
-+	time_t now;
-+	int rval;
-+
-+	time(&now);
-+	if (now < last_got || now >= last_got + reread_interval)
-+		check_ua_periodic();
-+
-+	/* Note that getUserAgent() always returns valid pointer */
-+	useragent_str = getUserAgent(msg);
-+	/*
-+	 * Make nul-terminated string copy of user-agent. We can't use
-+	 * that is in parsed header.
-+	 */
-+	ua = pkg_malloc(useragent_str->len + 1);
-+	if (ua == NULL) {
-+		LOG(L_ERR, "ERROR: check_ua: no memory\n");
-+		return -1;
-+	}
-+	memcpy(ua, useragent_str->s, useragent_str->len);
-+	ua[useragent_str->len] = '\0';
-+
-+	rval = -1;
-+	/* Iterate regexp list and set flags on matching */
-+	TAILQ_FOREACH(re, &reglist, re_link) {
-+		int rc;
-+
-+		rc = regexec(&re->re_compiled, ua, 0, NULL, 0);
-+		if (rc == 0) { /* matched */
-+			setflag(msg, re->re_flag_num);
-+			rval = 1;
-+		} else if (rc != REG_NOMATCH) {
-+			/* What's this? */
-+			LOG(L_ERR, "ERROR: check_ua: unexpected regexec error: %d\n", rc);
-+			rval = -1; /* 0 maybe??? */
-+			break;
-+		}
-+	}
-+	pkg_free(ua);
-+	return rval;
-+}
-+
-+static void
-+check_ua_periodic(void)
-+{
-+	reglist_head_t newhead;
-+	reglist_entry *re;
-+
-+	TAILQ_INIT(&newhead);
-+	/*
-+	 * Reread base and recompile expression list.
-+	 * As we have no way to check whether regexp list was changed,
-+	 * do it unconditionally.
-+	 */
-+	if (load_reglist(&newhead) < 0) {
-+		LOG(L_ERR, "check_ua: check_ua_periodic(): error reading new regexp file, keeping list from old one\n");
-+		return;
-+	}
-+	/* Delete old list and move all entries of new list to old one */
-+	while ((re = TAILQ_FIRST(&reglist)) != NULL) {
-+		TAILQ_REMOVE(&reglist, re, re_link);
-+		reglist_entry_free(re);
-+	}
-+	while ((re = TAILQ_FIRST(&newhead)) != NULL) {
-+		TAILQ_REMOVE(&newhead, re, re_link);
-+		TAILQ_INSERT_TAIL(&reglist, re, re_link);
-+	}
-+	time(&last_got);
-+	last_got -= (rand() % 3);
-+}
-+
-+static void
-+reglist_entry_free(reglist_entry *re)
-+{
-+	if (re->re_has_compiled)
-+		regfree(&re->re_compiled);
-+	if (re->re_regexp)
-+		pkg_free(re->re_regexp);
-+	pkg_free(re);
-+}
-+
-+#define UA_DUMMY_STR "Unknown"
-+#define UA_DUMMY_LEN 7
-+
-+/* Extract User-Agent */
-+static str *
-+getUserAgent(struct sip_msg *msg)
-+{
-+	static str notfound = {UA_DUMMY_STR, UA_DUMMY_LEN};
-+
-+	if ((parse_headers(msg, HDR_USERAGENT, 0)!=-1) && msg->user_agent &&
-+		msg->user_agent->body.len>0) {
-+		return &(msg->user_agent->body);
-+	}
-+	if ((parse_headers(msg, HDR_SERVER, 0)!=-1) && msg->server &&
-+		msg->server->body.len>0) {
-+		return &(msg->server->body);
-+	}
-+
-+	notfound.s = UA_DUMMY_STR;
-+	notfound.len = UA_DUMMY_LEN;
-+
-+	return &notfound;
-+}
diff --git a/net/ser/files/patch-modules__check_ua__tailq.h b/net/ser/files/patch-modules__check_ua__tailq.h
deleted file mode 100644
index 3e713ea72af8..000000000000
--- a/net/ser/files/patch-modules__check_ua__tailq.h
+++ /dev/null
@@ -1,154 +0,0 @@
-
-$FreeBSD$
-
---- modules/check_ua/tailq.h.orig
-+++ modules/check_ua/tailq.h
-@@ -0,0 +1,148 @@
-+/*
-+ * Copyright (c) 1991, 1993
-+ *	The Regents of the University of California.  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.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
-+ *
-+ *	@(#)queue.h	8.5 (Berkeley) 8/20/94
-+ * $FreeBSD$
-+ */
-+
-+#ifndef TAILQ_H_
-+#define	TAILQ_H_
-+
-+/*
-+ * Tail queue declarations.
-+ */
-+#define	TAILQ_HEAD(name, type)						\
-+struct name {								\
-+	struct type *tqh_first;	/* first element */			\
-+	struct type **tqh_last;	/* addr of last next element */		\
-+}
-+
-+#define	TAILQ_HEAD_INITIALIZER(head)					\
-+	{ NULL, &(head).tqh_first }
-+
-+#define	TAILQ_ENTRY(type)						\
-+struct {								\
-+	struct type *tqe_next;	/* next element */			\
-+	struct type **tqe_prev;	/* address of previous next element */	\
-+}
-+
-+/*
-+ * Tail queue functions.
-+ */
-+#define	TAILQ_CONCAT(head1, head2, field) do {				\
-+	if (!TAILQ_EMPTY(head2)) {					\
-+		*(head1)->tqh_last = (head2)->tqh_first;		\
-+		(head2)->tqh_first->field.tqe_prev = (head1)->tqh_last;	\
-+		(head1)->tqh_last = (head2)->tqh_last;			\
-+		TAILQ_INIT((head2));					\
-+	}								\
-+} while (0)
-+
-+#define	TAILQ_EMPTY(head)	((head)->tqh_first == NULL)
-+
-+#define	TAILQ_FIRST(head)	((head)->tqh_first)
-+
-+#define	TAILQ_FOREACH(var, head, field)					\
-+	for ((var) = TAILQ_FIRST((head));				\
-+	    (var);							\
-+	    (var) = TAILQ_NEXT((var), field))
-+
-+#define	TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = TAILQ_FIRST((head));				\
-+	    (var) && ((tvar) = TAILQ_NEXT((var), field), 1);		\
-+	    (var) = (tvar))
-+
-+#define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
-+	for ((var) = TAILQ_LAST((head), headname);			\
-+	    (var);							\
-+	    (var) = TAILQ_PREV((var), headname, field))
-+
-+#define	TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
-+	for ((var) = TAILQ_LAST((head), headname);			\
-+	    (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
-+	    (var) = (tvar))
-+
-+#define	TAILQ_INIT(head) do {						\
-+	TAILQ_FIRST((head)) = NULL;					\
-+	(head)->tqh_last = &TAILQ_FIRST((head));			\
-+} while (0)
-+
-+#define	TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-+	if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\
-+		TAILQ_NEXT((elm), field)->field.tqe_prev = 		\
-+		    &TAILQ_NEXT((elm), field);				\
-+	else {								\
-+		(head)->tqh_last = &TAILQ_NEXT((elm), field);		\
-+	}								\
-+	TAILQ_NEXT((listelm), field) = (elm);				\
-+	(elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field);		\
-+} while (0)
-+
-+#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
-+	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
-+	TAILQ_NEXT((elm), field) = (listelm);				\
-+	*(listelm)->field.tqe_prev = (elm);				\
-+	(listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field);		\
-+} while (0)
-+
-+#define	TAILQ_INSERT_HEAD(head, elm, field) do {			\
-+	if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL)	\
-+		TAILQ_FIRST((head))->field.tqe_prev =			\
-+		    &TAILQ_NEXT((elm), field);				\
-+	else								\
-+		(head)->tqh_last = &TAILQ_NEXT((elm), field);		\
-+	TAILQ_FIRST((head)) = (elm);					\
-+	(elm)->field.tqe_prev = &TAILQ_FIRST((head));			\
-+} while (0)
-+
-+#define	TAILQ_INSERT_TAIL(head, elm, field) do {			\
-+	TAILQ_NEXT((elm), field) = NULL;				\
-+	(elm)->field.tqe_prev = (head)->tqh_last;			\
-+	*(head)->tqh_last = (elm);					\
-+	(head)->tqh_last = &TAILQ_NEXT((elm), field);			\
-+} while (0)
-+
-+#define	TAILQ_LAST(head, headname)					\
-+	(*(((struct headname *)((head)->tqh_last))->tqh_last))
-+
-+#define	TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
-+
-+#define	TAILQ_PREV(elm, headname, field)				\
-+	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
-+
-+#define	TAILQ_REMOVE(head, elm, field) do {				\
-+	if ((TAILQ_NEXT((elm), field)) != NULL)				\
-+		TAILQ_NEXT((elm), field)->field.tqe_prev = 		\
-+		    (elm)->field.tqe_prev;				\
-+	else {								\
-+		(head)->tqh_last = (elm)->field.tqe_prev;		\
-+	}								\
-+	*(elm)->field.tqe_prev = TAILQ_NEXT((elm), field);		\
-+} while (0)
-+
-+#endif /* !TAILQ_H_ */
diff --git a/net/ser/files/patch-modules__group_radius__grouprad_mod.c b/net/ser/files/patch-modules__group_radius__grouprad_mod.c
deleted file mode 100644
index 51da6a47c822..000000000000
--- a/net/ser/files/patch-modules__group_radius__grouprad_mod.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- modules/group_radius/grouprad_mod.c.orig
-+++ modules/group_radius/grouprad_mod.c
-@@ -57,7 +57,7 @@
- /*
-  * Module parameter variables
-  */
--static char* radius_config = "/usr/local/etc/radiusclient/radiusclient.conf";
-+static char* radius_config = (CFG_DIR "radiusclient.conf");
- int use_domain = 0;  /* By default we use domain */
- 
- 
diff --git a/net/ser/files/patch-modules__mysql__my_con.c b/net/ser/files/patch-modules__mysql__my_con.c
deleted file mode 100644
index 50c1d6070e42..000000000000
--- a/net/ser/files/patch-modules__mysql__my_con.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- modules/mysql/my_con.c
-+++ modules/mysql/my_con.c
-@@ -70,6 +70,9 @@
- 		goto err;
- 	}
- 
-+	/* Enable reconnection explictly */
-+	ptr->con->reconnect = 1;
-+
- 	ptr->timestamp = time(0);
- 
- 	ptr->id = id;
diff --git a/net/ser/files/patch-modules__nathelper__moh.c b/net/ser/files/patch-modules__nathelper__moh.c
deleted file mode 100644
index 5c8ae4f33059..000000000000
--- a/net/ser/files/patch-modules__nathelper__moh.c
+++ /dev/null
@@ -1,434 +0,0 @@
-
-$FreeBSD$
-
---- modules/nathelper/moh.c
-+++ modules/nathelper/moh.c
-@@ -0,0 +1,428 @@
-+/* $Id: patch-modules::nathelper::moh.c,v 1.2 2005/04/05 13:10:07 netch Exp $
-+ *
-+ * Copyright (C) 2005 Porta Software Ltd
-+ *
-+ * This file is part of ser, a free SIP server.
-+ *
-+ * ser is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version
-+ *
-+ * For a license to use the ser software under conditions
-+ * other than those described here, or to purchase support for this
-+ * software, please contact iptel.org by e-mail at the following addresses:
-+ *    info@iptel.org
-+ *
-+ * ser is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include <sys/types.h>
-+#include <sys/uio.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include "../../parser/parser_f.h"
-+#include "../../ut.h"
-+#include "nhelpr_funcs.h"
-+#include "nathelper.h"
-+
-+/*
-+ * The following macro is used in force_rtp_proxy2_f() and twice
-+ * in start_moh() 
-+ */
-+
-+#define PARSE_PROXY_REPLY \
-+		 do { \
-+			argc = 0;	\
-+			memset(argv, 0, sizeof(argv));	\
-+			cpend=cp+strlen(cp);	\
-+			next=eat_token_end(cp, cpend);	\
-+			for (ap = argv; cp<cpend; cp=next+1, next=eat_token_end(cp, cpend)){	\
-+				*next=0;	\
-+				if (*cp != '\0') {	\
-+					*ap=cp;	\
-+					argc++;	\
-+					if ((char*)++ap >= ((char*)argv+sizeof(argv)))	\
-+						break;	\
-+				}	\
-+			} \
-+		} while(0)
-+
-+int
-+is_hold_f(struct sip_msg* msg, char *str1, char *str2)
-+{
-+	/* Look into body and find whether we see 0.0.0.0 as IP address.
-+	 * extract_mediaport() is designed to parse address from SDP.
-+	 * XXX Check all addresses or only first one? What if have some
-+	 * real addresses and some zero ones?
-+	 */
-+	str body, ip;
-+	int pf;
-+
-+	if (extract_body(msg, &body) == -1) {
-+		LOG(L_ERR,"ERROR: is_hold: cannot extract body from msg!\n");
-+		return 0;
-+	}
-+	if (extract_mediaip(&body, &ip, &pf) == -1) {
-+		LOG(L_ERR, "ERROR: is_hold: can't extract media IP from the SDP\n");
-+		return 0;
-+	}
-+	return isnulladdr(&ip, pf) ? 1 : -1;
-+}
-+
-+int
-+start_moh_f(struct sip_msg* msg, char* str1, char* str2)
-+{
-+	str callid, from_tag, to_tag;
-+	int asymmetric, flookup, force, real;
-+	int oidx, argc, medianum, c1p_altered, pf, pf1;
-+	int seen_audio, seen_video;
-+	str body, body1, tmpstr1, oldip, newip, oldport, newport;
-+	str medianum_str;
-+	char *cpend, *next, *bodylimit, *v1p, *v2p, *c1p, *c2p, *m1p, *m2p;
-+	char *cp;
-+	char medianum_buf[20], opts[16];
-+	char **ap, *argv[10];
-+	unsigned port;
-+	struct rtpp_node *node;
-+	struct iovec v_create[14] = {
-+		{NULL, 0},	/* command */
-+		{NULL, 0},	/* options */
-+		{" ", 1},	/* separator */
-+		{NULL, 0},	/* callid */
-+		{" ", 1},	/* separator */
-+		{NULL, 7},	/* newip */
-+		{" ", 1},	/* separator */
-+		{NULL, 1},	/* oldport */
-+		{" ", 1},	/* separator */
-+		{NULL, 0},	/* from_tag */
-+		{";", 1},	/* separator */
-+		{NULL, 0},	/* medianum */
-+		{" ", 1},	/* separator */
-+		{NULL, 0}	/* to_tag */
-+	};
-+	struct iovec v_play[14] = {
-+		{NULL, 0},	/* command */
-+		{NULL, 0},	/* options */
-+		{" ", 1},	/* separator */
-+		{NULL, 0},	/* callid */
-+		{" ", 1},	/* separator */
-+		{NULL, 7},	/* pname */
-+		{" ", 1},	/* separator */
-+		{NULL, 1},	/* codecs */
-+		{" ", 1},	/* separator */
-+		{NULL, 0},	/* to_tag */
-+		{";", 1},	/* separator */
-+		{NULL, 0},	/* medianum */
-+		{" ", 1},	/* separator */
-+		{NULL, 0}	/* from_tag */
-+	};
-+
-+	/* extract_body will also parse all the headers in the message as
-+	 * a side effect => don't move get_callid/get_to_tag in front of it
-+	 * -- andrei */
-+	if (extract_body(msg, &body) == -1) {
-+		LOG(L_ERR, "ERROR: force_rtp_proxy2: can't extract body "
-+		    "from the message\n");
-+		return -1;
-+	}
-+	if (get_callid(msg, &callid) == -1 || callid.len == 0) {
-+		LOG(L_ERR, "ERROR: start_moh: can't get Call-Id field\n");
-+		return -1;
-+	}
-+	if (get_to_tag(msg, &to_tag) == -1 || to_tag.len <= 0) {
-+		LOG(L_ERR, "ERROR: start_moh: can't get To tag\n");
-+		return -1;
-+	}
-+	if (get_from_tag(msg, &from_tag) == -1 || from_tag.len == 0) {
-+		LOG(L_ERR, "ERROR: start_moh: can't get From tag\n");
-+		return -1;
-+	}
-+	/* Setting specific options. XXX Do we really need this? */
-+	v_create[1].iov_base = opts;
-+	asymmetric = flookup = force = real = 0;
-+	force = 1; /* XXX we must force the proxying in this case */
-+	oidx = 2; /* 'UW' */
-+#if 0
-+	for (cp = str1; cp != NULL && *cp != '\0'; cp++) {
-+		switch (*cp) {
-+		case 'a':
-+		case 'A':
-+			opts[oidx++] = 'A';
-+			asymmetric = 1;
-+			real = 1;
-+			break;
-+
-+		case 'i':
-+		case 'I':
-+			opts[oidx++] = 'I';
-+			break;
-+
-+		case 'e':
-+		case 'E':
-+			opts[oidx++] = 'E';
-+			break;
-+
-+		case 'l':
-+		case 'L':
-+			flookup = 1;
-+			break;
-+
-+		case 'f':
-+		case 'F':
-+			force = 1;
-+			break;
-+
-+		case 'r':
-+		case 'R':
-+			real = 1;
-+			break;
-+
-+		default:
-+			LOG(L_ERR, "ERROR: force_rtp_proxy2: unknown option `%c'\n", *cp);
-+			return -1;
-+		}
-+	}
-+#endif
-+	/*
-+	 * Parsing of SDP body.
-+	 * It can contain a few session descriptions (each start with
-+	 * "v=" line), and each session may contain a few media descriptions
-+	 * (each start with "m=" line).
-+	 * We have to change ports in "m=", and also change IP addresses in
-+	 * "c=" which can be placed either in session header (fallback for
-+	 * all medias) or media description.
-+	 * Ports should be allocated for any media. IPs all should be changed
-+	 * to the same value (RTP proxy IP), so we can change all "c="
-+	 * unconditionally.
-+	 *
-+	 * Note start_moh() specifics: use only audio media or video media
-+	 * and stop after first of them of both kinds. But, medianum should
-+	 * reflect all of them.
-+	 */
-+	bodylimit = body.s + body.len;
-+	v2p = v1p = find_sdp_line(body.s, bodylimit, 'v');
-+	if (v1p == NULL) {
-+		LOG(L_ERR, "ERROR: start_moh: no sessions in SDP\n");
-+		return -1;
-+	}
-+	medianum = 0;
-+	for(;;) {
-+		/* Per-session iteration. */
-+		v1p = v2p;
-+		if (v1p == NULL || v1p >= bodylimit)
-+			break; /* No sessions left */
-+		v2p = find_next_sdp_line(v1p, bodylimit, 'v', bodylimit);
-+		/* v2p is text limit for session parsing. */
-+		m1p = find_sdp_line(v1p, v2p, 'm');
-+		/* Have this session media description? */
-+		if (m1p == NULL) {
-+			LOG(L_ERR, "ERROR: start_moh: no m= in session\n");
-+			return -1;
-+		}
-+		/*
-+		 * Find c1p only between session begin and first media.
-+		 * c1p will give common c= for all medias.
-+		 */
-+		c1p = find_sdp_line(v1p, m1p, 'c');
-+		c1p_altered = 0;
-+		/* Have session. Iterate media descriptions in session */
-+		seen_audio = seen_video = 0;
-+		m2p = m1p;
-+		while (!seen_audio || !seen_video) {
-+			int is_audio, is_video;
-+			/* We pass address to proxy and get some port from
-+			 * its resources. Then, if old address was empty
-+			 * (0.0.0.0), create a play stream for this media.
-+			 */
-+			m1p = m2p;
-+			if (m1p == NULL || m1p >= v2p)
-+				break;
-+			m2p = find_next_sdp_line(m1p, v2p, 'm', v2p);
-+			/* c2p will point to per-media "c=" */
-+			c2p = find_sdp_line(m1p, m2p, 'c');
-+			++medianum;
-+			/*
-+			 * start_moh() specifics: work only for audio/video
-+			 * media and apply to first of any in session.
-+			 */
-+			is_audio = (strncmp(m1p, "m=audio ", 8) == 0);
-+			is_video = (strncmp(m1p, "m=video ", 8) == 0);
-+			if ((is_audio && seen_audio) ||
-+			    (is_video && seen_video) ||
-+			    (!is_audio && !is_video))
-+				continue;
-+			seen_audio = seen_audio || is_audio;
-+			seen_video = seen_video || is_video;
-+			/* Extract address and port */
-+			tmpstr1.s = c2p ? c2p : c1p;
-+			if (tmpstr1.s == NULL) {
-+				/* No "c=" */
-+				LOG(L_ERR, "ERROR: start_moh: can't find media IP in the message\n");
-+				return -1;
-+			}
-+			tmpstr1.len = v2p - tmpstr1.s; /* limit is session limit text */
-+			if (extract_mediaip(&tmpstr1, &oldip, &pf) == -1) {
-+				LOG(L_ERR, "ERROR: start_moh: can't extract media IP "
-+				    "from the message\n");
-+				return -1;
-+			}
-+			tmpstr1.s = m1p;
-+			tmpstr1.len = m2p - m1p;
-+			if (extract_mediaport(&tmpstr1, &oldport) == -1) {
-+				LOG(L_ERR, "ERROR: start_moh: can't extract media port "
-+				    "from the message\n");
-+				return -1;
-+			}
-+			if (asymmetric != 0 || real != 0) {
-+				newip = oldip;
-+			} else {
-+				newip.s = ip_addr2a(&msg->rcv.src_ip);
-+				newip.len = strlen(newip.s);
-+			}
-+			/* XXX must compare address families in all addresses */
-+			if (pf == AF_INET6) {
-+				opts[oidx] = '6';
-+				oidx++;
-+			}
-+
-+			/*
-+			 * If don't see NULL addr, this is not hold.
-+			 * So, skip to next one.
-+			 * XXX should also support "a=sendonly"
-+			 */
-+			if (!isnulladdr(&oldip, pf))
-+				continue;
-+
-+			/* Prepare proxy command strings. */
-+			snprintf(medianum_buf, sizeof medianum_buf, "%d", medianum);
-+			medianum_str.s = medianum_buf;
-+			medianum_str.len = strlen(medianum_buf);
-+			opts[0] = 'U'; opts[1] = 'W';
-+			v_create[1].iov_len = oidx;
-+			STR2IOVEC(callid, v_create[3]);
-+			STR2IOVEC(newip, v_create[5]);
-+			STR2IOVEC(oldport, v_create[7]);
-+			STR2IOVEC(from_tag, v_create[9]);
-+			STR2IOVEC(medianum_str, v_create[11]);
-+			STR2IOVEC(to_tag, v_create[13]);
-+			STR2IOVEC(callid, v_play[3]);
-+			if (is_audio) {
-+				SZ2IOVEC(pname_audio, v_play[5]);
-+				SZ2IOVEC(codecs_audio, v_play[7]);
-+			} else {
-+				SZ2IOVEC(pname_video, v_play[5]);
-+				SZ2IOVEC(codecs_video, v_play[7]);
-+			}
-+			STR2IOVEC(to_tag, v_play[9]);
-+			STR2IOVEC(medianum_str, v_play[11]);
-+			STR2IOVEC(from_tag, v_play[13]);
-+			SZ2IOVEC("P", v_play[1]);
-+			/* Send command. */
-+			do {
-+				node = select_rtpp_node(callid, 1);
-+				if (!node) {
-+					LOG(L_ERR, "ERROR: start_moh: no available proxies\n");
-+					return -1;
-+				}
-+				cp = send_rtpp_command(node, v_create, 14);
-+				if (cp == NULL)
-+					continue;
-+				LOG(L_DBG, "start_moh: proxy reply to update: %s\n", cp);
-+				PARSE_PROXY_REPLY;
-+				if (argc < 1) {
-+					LOG(L_ERR, "start_moh: no reply from rtp proxy\n");
-+					return -1;
-+				}
-+				port = atoi(argv[0]);
-+				if (port <= 0 || port > 65535) {
-+					LOG(L_ERR, "start_moh: incorrect port in reply from rtp proxy\n");
-+					return -1;
-+				}
-+	
-+				pf1 = (argc >= 3 && argv[2][0] == '6') ? AF_INET6 : AF_INET;
-+				newip.s = (argc < 2) ? str2 : argv[1];
-+				newip.len = strlen(newip.s);
-+				newport.s = int2str(port, &newport.len); /* beware static buffer */
-+				/* Alter port. */
-+				body1.s = m1p;
-+				body1.len = bodylimit - body1.s;
-+				if (alter_mediaport(msg, &body1, &oldport, &newport, 0) == -1) {
-+					LOG(L_ERR, "start_mon: alter_mediaport() failed\n");
-+					return -1;
-+				}
-+				/* Alter IP. Don't alter IP common for the session
-+				 * more than once.
-+				 */
-+				if (c2p != NULL || !c1p_altered) {
-+					body1.s = c2p ? c2p : c1p;
-+					body1.len = m2p - body1.s;
-+					if (alter_mediaip(msg, &body1, &oldip, pf, &newip, pf1, 2) == -1) {
-+						LOG(L_ERR, "start_moh: alter_mediaip() failed\n");
-+						return -1;
-+					}
-+					if (!c2p)
-+						c1p_altered = 1;
-+				}
-+				cp = send_rtpp_command(node, v_play, 14);
-+				LOG(L_DBG, "start_moh: proxy reply to play: %s\n", cp);
-+				if (cp == NULL)
-+					continue;
-+				PARSE_PROXY_REPLY;
-+				if (argc < 1) {
-+					LOG(L_ERR, "start_moh: no reply from rtp proxy\n");
-+					return -1;
-+				}
-+			} while(cp == NULL);
-+		} /* Iterate medias in session */
-+	} /* Iterate sessions */
-+	return 1;
-+}
-+
-+int
-+stop_moh_f(struct sip_msg* msg, char* str1, char* str2)
-+{
-+	str callid, to_tag, from_tag;
-+	struct rtpp_node *node;
-+	struct iovec v_noplay[8] = {{NULL, 0}, {"S", 1}, {" ", 1},
-+	    {NULL, 0}, {" ", 1}, {NULL, 0}, {" ", 1}, {NULL, 0}};
-+	struct iovec v_del[8] = {{NULL, 0}, {"DW", 2}, {" ", 1},
-+	    {NULL, 0}, {" ", 1}, {NULL, 0}, {" ", 1}, {NULL, 0}};
-+
-+	if (get_callid(msg, &callid) == -1 || callid.len == 0) {
-+		LOG(L_ERR, "ERROR: stop_moh: can't get Call-Id field\n");
-+		return -1;
-+	}
-+	if (get_to_tag(msg, &to_tag) == -1 || to_tag.len <= 0) {
-+		LOG(L_ERR, "ERROR: stop_moh: can't get To tag\n");
-+		return -1;
-+	}
-+	if (get_from_tag(msg, &from_tag) == -1 || from_tag.len == 0) {
-+		LOG(L_ERR, "ERROR: stop_moh: can't get From tag\n");
-+		return -1;
-+	}
-+	/* Ask RTP proxy to stop all plays for this tag. We don't iterate
-+	 * separate sessions; RTP proxy has knowledge of them.
-+	 */
-+	STR2IOVEC(callid, v_noplay[3]);
-+	STR2IOVEC(to_tag, v_noplay[5]);
-+	STR2IOVEC(from_tag, v_noplay[7]);
-+	node = select_rtpp_node(callid, 1);
-+	send_rtpp_command(node, v_noplay, 8);
-+	/* Ask weak deletion for the session. The same as previous;
-+	 * RTP proxy knows all sessions.
-+	 */
-+	STR2IOVEC(callid, v_del[3]);
-+	STR2IOVEC(to_tag, v_del[5]);
-+	STR2IOVEC(from_tag, v_del[7]);
-+	send_rtpp_command(node, v_del, 8);
-+	return 1;
-+}
diff --git a/net/ser/files/patch-modules__nathelper__nathelper.c b/net/ser/files/patch-modules__nathelper__nathelper.c
deleted file mode 100644
index d85865e0eaa0..000000000000
--- a/net/ser/files/patch-modules__nathelper__nathelper.c
+++ /dev/null
@@ -1,1786 +0,0 @@
-
-$FreeBSD$
-
---- modules/nathelper/nathelper.c.orig
-+++ modules/nathelper/nathelper.c
-@@ -110,14 +110,45 @@
-  *
-  * 2004-03-22	Fix get_body position (should be called before get_callid)
-  * 				(andrei)
-+ *
-  * 2004-03-24	Fix newport for null ip address case (e.g onhold re-INVITE)
-  * 				(andrei)
-- * 2004-09-30	added received port != via port test (andrei) 
-+ *
-+ * 2004-09-30	added received port != via port test (andrei)
-+ *
-  * 2004-10-10   force_socket option introduced (jiri)
-+ * 2004-12-21	support for multiple medias added (netch)
-+ * 2005-01-18	proxying on protocol type (RTP/AVP, udp, udptl), not
-+ *		media type. (sobomax,netch)
-+ *
-+ * 2005-02-24	Added support for using more than one rtp proxy, in which
-+ *		case traffic will be distributed evenly among them. In addition,
-+ *		each such proxy can be assigned a weight, which will specify
-+ *		which share of the traffic should be placed to this particular
-+ *		proxy.
-+ *
-+ *		Introduce failover mechanism, so that if SER detects that one
-+ *		of many proxies is no longer available it temporarily decreases
-+ *		its weight to 0, so that no traffic will be assigned to it.
-+ *		Such "disabled" proxies are periodically checked to see if they
-+ *		are back to normal in which case respective weight is restored
-+ *		resulting in traffic being sent to that proxy again.
-  *
-+ *		Those features can be enabled by specifying more than one "URI"
-+ *		in the rtpproxy_sock parameter, optionally followed by the weight,
-+ *		which if absent is assumed to be 1, for example:
-+ *
-+ *		rtpproxy_sock="unix:/foo/bar=4 udp:1.2.3.4:3456=3 udp:5.6.7.8:5432=1"
-+ *
-+ * 2005-03-24	music-on-hold implemented (netch)
-+ *
-+ * 2007-04-23	Do NAT pinging in the separate dedicated process. It provides much
-+ *		better scalability than doing it in the main one.
-  */
- 
- #include "nhelpr_funcs.h"
-+#include "nathelper.h"
-+#include "../../action.h"
- #include "../../flags.h"
- #include "../../sr_module.h"
- #include "../../dprint.h"
-@@ -127,6 +158,7 @@
- #include "../../forward.h"
- #include "../../mem/mem.h"
- #include "../../parser/parse_from.h"
-+#include "../../parser/parse_hostport.h"
- #include "../../parser/parse_to.h"
- #include "../../parser/parse_uri.h"
- #include "../../parser/parser_f.h"
-@@ -171,39 +203,32 @@
- #define	NAT_UAC_TEST_S_1918	0x08
- #define	NAT_UAC_TEST_RPORT	0x10
- 
--/* Handy macros */
--#define	STR2IOVEC(sx, ix)	{(ix).iov_base = (sx).s; (ix).iov_len = (sx).len;}
--
- /* Supported version of the RTP proxy command protocol */
- #define	SUP_CPROTOVER	20040107
-+/* Required additional version of the RTP proxy command protocol */
-+#define	REQ_CPROTOVER	"20050322"
- #define	CPORT		"22222"
- 
- static int nat_uac_test_f(struct sip_msg* msg, char* str1, char* str2);
- static int fix_nated_contact_f(struct sip_msg *, char *, char *);
- static int fix_nated_sdp_f(struct sip_msg *, char *, char *);
--static int extract_mediaip(str *, str *, int *);
--static int extract_mediaport(str *, str *);
--static int alter_mediaip(struct sip_msg *, str *, str *, int, str *, int, int);
--static int alter_mediaport(struct sip_msg *, str *, str *, str *, int);
-+static int fixate_sdp_f(struct sip_msg *, char *, char *);
- static char *gencookie();
--static int rtpp_test(int, int);
--static char *send_rtpp_command(struct iovec *, int);
-+static int rtpp_test(struct rtpp_node*, int, int);
- static int unforce_rtp_proxy_f(struct sip_msg *, char *, char *);
-+static int start_recording_f(struct sip_msg *, char *, char *);
- static int force_rtp_proxy0_f(struct sip_msg *, char *, char *);
- static int force_rtp_proxy1_f(struct sip_msg *, char *, char *);
- static int force_rtp_proxy2_f(struct sip_msg *, char *, char *);
- static int fix_nated_register_f(struct sip_msg *, char *, char *);
- static int add_rcv_param_f(struct sip_msg *, char *, char *);
-+static int rewrite_from_from_f(struct sip_msg *, char *, char *);
- 
--static void timer(unsigned int, void *);
- inline static int fixup_str2int(void**, int);
- static int mod_init(void);
-+static void mod_cleanup(void);
- static int child_init(int);
- 
--static usrloc_api_t ul;
--
--static int cblen = 0;
--static int natping_interval = 0;
- struct socket_info* force_socket = 0;
- 
- 
-@@ -218,27 +243,51 @@
- 	{NULL, 0, 0}
- };
- 
--/*
-- * If this parameter is set then the natpinger will ping only contacts
-- * that have the NAT flag set in user location database
-- */
--static int ping_nated_only = 0;
--static const char sbuf[4] = {0, 0, 0, 0};
--static char *rtpproxy_sock = "unix:/var/run/rtpproxy.sock";
-+static str sup_ptypes[] = {
-+	{.s = "udp", .len = 3},
-+	{.s = "udptl", .len = 5},
-+	{.s = "rtp/avp", .len = 7},
-+	{.s = NULL, .len = 0}
-+};
-+
-+static char *rtpproxy_sock = "unix:/var/run/rtpproxy.sock"; /* list */
- static char *force_socket_str = 0;
- static int rtpproxy_disable = 0;
- static int rtpproxy_disable_tout = 60;
- static int rtpproxy_retr = 5;
- static int rtpproxy_tout = 1;
--static int umode = 0;
--static int controlfd;
- static pid_t mypid;
- static unsigned int myseqn = 0;
--static int rcv_avp_no=42;
-+static int rcv_avp_no = 42;
-+char *pname_audio = "-";
-+char *pname_video = "-";
-+char *codecs_audio = "-";
-+char *codecs_video = "-";
-+
-+struct rtpp_head {
-+	struct rtpp_node	*rn_first;
-+	struct rtpp_node	*rn_last;
-+};
-+
-+struct rtpp_node {
-+	char			*rn_url;	/* unparsed, deletable */
-+	int			rn_umode;
-+	char			*rn_address;	/* substring of rn_url */
-+	int			rn_fd;		/* control fd */
-+	int			rn_disabled;	/* found unaccessible? */
-+	unsigned		rn_weight;	/* for load balancing */
-+	int			rn_recheck_ticks;
-+	struct rtpp_node	*rn_next;
-+};
-+
-+/* RTP proxy balancing list */
-+static struct rtpp_head rtpp_list;
-+static int rtpp_node_count = 0;
- 
- static cmd_export_t cmds[] = {
- 	{"fix_nated_contact",  fix_nated_contact_f,    0, 0,             REQUEST_ROUTE | ONREPLY_ROUTE },
- 	{"fix_nated_sdp",      fix_nated_sdp_f,        1, fixup_str2int, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE },
-+	{"fixate_sdp",         fixate_sdp_f,           0, 0,             REQUEST_ROUTE | ONREPLY_ROUTE },
- 	{"unforce_rtp_proxy",  unforce_rtp_proxy_f,    0, 0,             REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE },
- 	{"force_rtp_proxy",    force_rtp_proxy0_f,     0, 0,             REQUEST_ROUTE | ONREPLY_ROUTE },
- 	{"force_rtp_proxy",    force_rtp_proxy1_f,     1, 0,             REQUEST_ROUTE | ONREPLY_ROUTE },
-@@ -246,11 +295,17 @@
- 	{"nat_uac_test",       nat_uac_test_f,         1, fixup_str2int, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE },
- 	{"fix_nated_register", fix_nated_register_f,   0, 0,             REQUEST_ROUTE },
- 	{"add_rcv_param",      add_rcv_param_f,        0, 0,             REQUEST_ROUTE },
-+	{"rewrite_from_from",  rewrite_from_from_f,    0, 0,             REQUEST_ROUTE | ONREPLY_ROUTE },
-+	{"is_hold",		is_hold_f,	       0, 0,		 REQUEST_ROUTE | ONREPLY_ROUTE },
-+	{"start_moh",		start_moh_f,	       0, 0,		 REQUEST_ROUTE | ONREPLY_ROUTE },
-+	{"stop_moh",		stop_moh_f,	       0, 0,		 REQUEST_ROUTE | ONREPLY_ROUTE },
-+	{"start_recording",	start_recording_f,     0, 0,		 REQUEST_ROUTE | ONREPLY_ROUTE },
- 	{0, 0, 0, 0, 0}
- };
- 
- static param_export_t params[] = {
- 	{"natping_interval",      INT_PARAM, &natping_interval      },
-+	{"natping_method",	  STR_PARAM, &natping_method	    },
- 	{"ping_nated_only",       INT_PARAM, &ping_nated_only       },
- 	{"rtpproxy_sock",         STR_PARAM, &rtpproxy_sock         },
- 	{"rtpproxy_disable",      INT_PARAM, &rtpproxy_disable      },
-@@ -259,6 +314,10 @@
- 	{"rtpproxy_tout",         INT_PARAM, &rtpproxy_tout         },
- 	{"received_avp",          INT_PARAM, &rcv_avp_no            },
- 	{"force_socket",          STR_PARAM, &force_socket_str		},
-+	{"pname_audio",		  STR_PARAM, &pname_audio		},
-+	{"pname_video",		  STR_PARAM, &pname_video		},
-+	{"codecs_audio",	  STR_PARAM, &codecs_audio		},
-+	{"codecs_video",	  STR_PARAM, &codecs_video		},
- 	{0, 0, 0}
- };
- 
-@@ -268,7 +327,7 @@
- 	params,
- 	mod_init,
- 	0, /* reply processing */
--	0, /* destroy function */
-+	mod_cleanup, /* destroy function */
- 	0, /* on_break */
- 	child_init
- };
-@@ -277,8 +336,6 @@
- mod_init(void)
- {
- 	int i;
--	char *cp;
--	bind_usrloc_t bind_usrloc;
- 	struct in_addr addr;
- 	str socket_str;
- 
-@@ -288,18 +345,9 @@
- 		force_socket=grep_sock_info(&socket_str,0,0);
- 	}
- 
--	if (natping_interval > 0) {
--		bind_usrloc = (bind_usrloc_t)find_export("ul_bind_usrloc", 1, 0);
--		if (!bind_usrloc) {
--			LOG(L_ERR, "nathelper: Can't find usrloc module\n");
-- 			return -1;
-- 		}
--
--		if (bind_usrloc(&ul) < 0) {
--			return -1;
--		}
--
--		register_timer(timer, NULL, natping_interval);
-+	if (natpinger_init() < 0) {
-+		LOG(L_ERR, "nathelper: natpinger_init() failed\n");
-+		return -1;
- 	}
- 
- 	/* Prepare 1918 networks list */
-@@ -309,83 +357,154 @@
- 		nets_1918[i].netaddr = ntohl(addr.s_addr) & nets_1918[i].mask;
- 	}
- 
-+	memset(&rtpp_list, 0, sizeof(rtpp_list));
-+	rtpp_node_count = 0;
- 	if (rtpproxy_disable == 0) {
--		/* Make rtpproxy_sock writable */
--		cp = pkg_malloc(strlen(rtpproxy_sock) + 1);
--		if (cp == NULL) {
--			LOG(L_ERR, "nathelper: Can't allocate memory\n");
--			return -1;
--		}
--		strcpy(cp, rtpproxy_sock);
--		rtpproxy_sock = cp;
-+		/* Make rtp proxies list. */
-+		char *p, *p1, *p2, *plim;
- 
--		if (strncmp(rtpproxy_sock, "udp:", 4) == 0) {
--			umode = 1;
--			rtpproxy_sock += 4;
--		} else if (strncmp(rtpproxy_sock, "udp6:", 5) == 0) {
--			umode = 6;
--			rtpproxy_sock += 5;
--		} else if (strncmp(rtpproxy_sock, "unix:", 5) == 0) {
--			umode = 0;
--			rtpproxy_sock += 5;
-+		p = rtpproxy_sock;
-+		plim = p + strlen(p);
-+		for(;;) {
-+			struct rtpp_node *pnode;
-+			int weight;
-+
-+			weight = 1;
-+			while (*p && isspace(*p))
-+				++p;
-+			if (p >= plim)
-+				break;
-+			p1 = p;
-+			while (*p && !isspace(*p))
-+				++p;
-+			if (p <= p1)
-+				break; /* may happen??? */
-+			/* Have weight specified? If yes, scan it */
-+			p2 = memchr(p1, '=', p - p1);
-+			if (p2 != NULL) {
-+				weight = strtoul(p2 + 1, NULL, 10);
-+			} else {
-+				p2 = p;
-+			}
-+			pnode = pkg_malloc(sizeof(struct rtpp_node));
-+			if (pnode == NULL) {
-+				LOG(L_ERR, "nathelper: Can't allocate memory\n");
-+				return -1;
-+			}
-+			memset(pnode, 0, sizeof(*pnode));
-+			pnode->rn_recheck_ticks = 0;
-+			pnode->rn_weight = weight;
-+			pnode->rn_umode = 0;
-+			pnode->rn_fd = -1;
-+			pnode->rn_disabled = 0;
-+			pnode->rn_url = pkg_malloc(p2 - p1 + 1);
-+			if (pnode->rn_url == NULL) {
-+				LOG(L_ERR, "nathelper: Can't allocate memory\n");
-+				return -1;
-+			}
-+			memmove(pnode->rn_url, p1, p2 - p1);
-+			pnode->rn_url[p2 - p1] = 0;
-+			if (rtpp_list.rn_first == NULL) {
-+				rtpp_list.rn_first = pnode;
-+			} else {
-+				rtpp_list.rn_last->rn_next = pnode;
-+			}
-+			rtpp_list.rn_last = pnode;
-+			++rtpp_node_count;
-+			/* Leave only address in rn_address */
-+			pnode->rn_address = pnode->rn_url;
-+			if (strncmp(pnode->rn_address, "udp:", 4) == 0) {
-+				pnode->rn_umode = 1;
-+				pnode->rn_address += 4;
-+			} else if (strncmp(pnode->rn_address, "udp6:", 5) == 0) {
-+				pnode->rn_umode = 6;
-+				pnode->rn_address += 5;
-+			} else if (strncmp(pnode->rn_address, "unix:", 5) == 0) {
-+				pnode->rn_umode = 0;
-+				pnode->rn_address += 5;
-+			}
- 		}
- 	}
- 
- 	return 0;
- }
- 
-+static void
-+mod_cleanup(void)
-+{
-+
-+	natpinger_cleanup();
-+}
-+
- static int
- child_init(int rank)
- {
- 	int n;
- 	char *cp;
- 	struct addrinfo hints, *res;
-+	struct rtpp_node *pnode;
- 
--	if (rtpproxy_disable == 0) {
--		mypid = getpid();
--		if (umode != 0) {
--			cp = strrchr(rtpproxy_sock, ':');
--			if (cp != NULL) {
--				*cp = '\0';
--				cp++;
--			}
--			if (cp == NULL || *cp == '\0')
--				cp = CPORT;
-+	if (natpinger_child_init(rank) < 0)
-+		return -1;
- 
--			memset(&hints, 0, sizeof(hints));
--			hints.ai_flags = 0;
--			hints.ai_family = (umode == 6) ? AF_INET6 : AF_INET;
--			hints.ai_socktype = SOCK_DGRAM;
--			if ((n = getaddrinfo(rtpproxy_sock, cp, &hints, &res)) != 0) {
--				LOG(L_ERR, "nathelper: getaddrinfo: %s\n", gai_strerror(n));
--				return -1;
--			}
-+	/* Iterate known RTP proxies - create sockets */
-+	mypid = getpid();
-+	for (pnode = rtpp_list.rn_first; pnode != NULL; pnode = pnode->rn_next) {
-+		char *old_colon;
- 
--			controlfd = socket((umode == 6) ? AF_INET6 : AF_INET, SOCK_DGRAM, 0);
--			if (controlfd == -1) {
--				LOG(L_ERR, "nathelper: can't create socket\n");
--				freeaddrinfo(res);
--				return -1;
--			}
-+		if (pnode->rn_umode == 0)
-+			goto rptest;
-+		/*
-+		 * This is UDP or UDP6. Detect host and port; lookup host;
-+		 * do connect() in order to specify peer address
-+		 */
-+		old_colon = cp = strrchr(pnode->rn_address, ':');
-+		if (cp != NULL) {
-+			old_colon = cp;
-+			*cp = '\0';
-+			cp++;
-+		}
-+		if (cp == NULL || *cp == '\0')
-+			cp = CPORT;
- 
--			if (connect(controlfd, res->ai_addr, res->ai_addrlen) == -1) {
--				LOG(L_ERR, "nathelper: can't connect to a RTP proxy\n");
--				close(controlfd);
--				freeaddrinfo(res);
--				return -1;
--			}
-+		memset(&hints, 0, sizeof(hints));
-+		hints.ai_flags = 0;
-+		hints.ai_family = (pnode->rn_umode == 6) ? AF_INET6 : AF_INET;
-+		hints.ai_socktype = SOCK_DGRAM;
-+		if ((n = getaddrinfo(pnode->rn_address, cp, &hints, &res)) != 0) {
-+			LOG(L_ERR, "nathelper: getaddrinfo: %s\n", gai_strerror(n));
-+			return -1;
-+		}
-+		if (old_colon)
-+			*old_colon = ':'; /* restore rn_address */
-+
-+		pnode->rn_fd = socket((pnode->rn_umode == 6)
-+		    ? AF_INET6 : AF_INET, SOCK_DGRAM, 0);
-+		if (pnode->rn_fd == -1) {
-+			LOG(L_ERR, "nathelper: can't create socket\n");
- 			freeaddrinfo(res);
-+			return -1;
- 		}
- 
--		rtpproxy_disable = rtpp_test(0, 1);
--	} else {
--		rtpproxy_disable_tout = -1;
-+		if (connect(pnode->rn_fd, res->ai_addr, res->ai_addrlen) == -1) {
-+			LOG(L_ERR, "nathelper: can't connect to a RTP proxy\n");
-+			close(pnode->rn_fd);
-+			pnode->rn_fd = -1;
-+			freeaddrinfo(res);
-+			return -1;
-+		}
-+		freeaddrinfo(res);
-+rptest:
-+		pnode->rn_disabled = rtpp_test(pnode, 0, 1);
- 	}
- 
-+	if (rtpproxy_disable)
-+		rtpproxy_disable_tout = -1;
-+
- 	return 0;
- }
- 
--static int
-+int
- isnulladdr(str *sx, int pf)
- {
- 	char *cp;
-@@ -440,7 +559,7 @@
-  * assumes the to header is already parsed, so
-  * make sure it really is before calling this function
-  */
--static inline int
-+int
- get_to_tag(struct sip_msg* _m, str* _tag)
- {
- 
-@@ -464,7 +583,7 @@
- /*
-  * Extract tag from From header field of a request
-  */
--static inline int
-+int
- get_from_tag(struct sip_msg* _m, str* _tag)
- {
- 
-@@ -489,7 +608,7 @@
-  * (so make sure it is, before calling this function or
-  *  it might fail even if the message _has_ a callid)
-  */
--static inline int
-+int
- get_callid(struct sip_msg* _m, str* _cid)
- {
- 
-@@ -563,9 +682,13 @@
- 	if (anchor == 0)
- 		return -1;
- 
--	hostport = uri.host;
--	if (uri.port.len > 0)
--		hostport.len = uri.port.s + uri.port.len - uri.host.s;
-+	if (uri.maddr_val.len == 0) {
-+		hostport = uri.host;
-+		if (uri.port.len > 0)
-+			hostport.len = uri.port.s + uri.port.len - uri.host.s;
-+	} else {
-+		hostport = uri.maddr_val;
-+	}
- 
- 	cp = ip_addr2a(&msg->rcv.src_ip);
- 	len = c->uri.len + strlen(cp) + 6 /* :port */ - hostport.len + 1;
-@@ -652,11 +775,22 @@
- {
- 	struct sip_uri uri;
- 	contact_t* c;
-+	char t;
-+	str host;
-+	short int port;
- 
- 	if (get_contact_uri(msg, &uri, &c) == -1)
- 		return -1;
- 
--	return (is1918addr(&(uri.host)) == 1) ? 1 : 0;
-+	if (uri.maddr_val.len == 0)
-+		return (is1918addr(&(uri.host)) == 1) ? 1 : 0;
-+	t = uri.maddr_val.s[uri.maddr_val.len];
-+	uri.maddr_val.s[uri.maddr_val.len] = '\0';
-+	parse_hostport(uri.maddr_val.s, &host, &port);
-+	uri.maddr_val.s[uri.maddr_val.len] = t;
-+	if (host.len <= 0)
-+		return 0;
-+	return (is1918addr(&host) == 1) ? 1 : 0;
- }
- 
- /*
-@@ -756,8 +890,8 @@
- static int
- fix_nated_sdp_f(struct sip_msg* msg, char* str1, char* str2)
- {
--	str body, body1, oldip, oldip1, newip;
--	int level, pf, pf1;
-+	str body, body1, oldip, newip;
-+	int level, pf;
- 	char *buf;
- 	struct lump* anchor;
- 
-@@ -804,37 +938,43 @@
- 	}
- 
- 	if (level & FIX_MEDIP) {
--		if (extract_mediaip(&body, &oldip, &pf) == -1) {
--			LOG(L_ERR, "ERROR: fix_nated_sdp: can't extract media IP from the SDP\n");
--			goto finalize;
--		}
--		if (pf != AF_INET) {
--			LOG(L_ERR, "ERROR: fix_nated_sdp: "
--			    "not an IPv4 address in SDP\n");
--			goto finalize;
--		}
--		body1.s = oldip.s + oldip.len;
--		body1.len = body.s + body.len - body1.s;
--		if (extract_mediaip(&body1, &oldip1, &pf1) == -1) {
--			oldip1.len = 0;
--		}
--		if (oldip1.len > 0 && pf != pf1) {
--			LOG(L_ERR, "ERROR: fix_nated_sdp: mismatching "
--			    "address families in SDP\n");
--			return -1;
--		}
--
-+		/* Iterate all c= and replace ips in them. */
-+		unsigned hasreplaced = 0;
-+		int pf1 = 0;
-+		str body2;
-+		char* bodylimit = body.s + body.len;
- 		newip.s = ip_addr2a(&msg->rcv.src_ip);
- 		newip.len = strlen(newip.s);
--		if (alter_mediaip(msg, &body, &oldip, pf, &newip, pf,
--		    1) == -1) {
--			LOG(L_ERR, "ERROR: fix_nated_sdp: can't alter media IP");
--			return -1;
-+		body1 = body;
-+		for(;;) {
-+			if (extract_mediaip(&body1, &oldip, &pf) == -1)
-+				break;
-+			if (pf != AF_INET) {
-+				LOG(L_ERR, "ERROR: fix_nated_sdp: "
-+				    "not an IPv4 address in SDP\n");
-+				goto finalize;
-+			}
-+			if (!pf1)
-+				pf1 = pf;
-+			else if (pf != pf1) {
-+				LOG(L_ERR, "ERROR: fix_nated_sdp: mismatching "
-+				    "address families in SDP\n");
-+				return -1;
-+			}
-+			body2.s = oldip.s + oldip.len;
-+			body2.len = bodylimit - body2.s;
-+			if (alter_mediaip(msg, &body1, &oldip, pf, &newip, pf,
-+			    1) == -1)
-+			{
-+				LOG(L_ERR, "ERROR: fix_nated_sdp: can't alter media IP");
-+				return -1;
-+			}
-+			hasreplaced = 1;
-+			body1 = body2;
- 		}
--		if (oldip1.len > 0 && alter_mediaip(msg, &body, &oldip1, pf1,
--		    &newip, pf, 0) == -1) {
--			LOG(L_ERR, "ERROR: fix_nated_sdp: can't alter media IP");
--			return -1;
-+		if (!hasreplaced) {
-+			LOG(L_ERR, "ERROR: fix_nated_sdp: can't extract media IP from the SDP\n");
-+			goto finalize;
- 		}
- 	}
- 
-@@ -842,7 +982,7 @@
- 	return 1;
- }
- 
--static int
-+int
- extract_mediaip(str *body, str *mediaip, int *pf)
- {
- 	char *cp, *cp1;
-@@ -856,7 +996,7 @@
- 		cp = cp1 + 2;
- 	}
- 	if (cp1 == NULL) {
--		LOG(L_DBG, "ERROR: extract_mediaip: no `c=' in SDP\n");
-+		LOG(L_ERR, "ERROR: extract_mediaip: no `c=' in SDP\n");
- 		return -1;
- 	}
- 	mediaip->s = cp1 + 2;
-@@ -898,11 +1038,12 @@
- 	return 1;
- }
- 
--static int
-+int
- extract_mediaport(str *body, str *mediaport)
- {
- 	char *cp, *cp1;
--	int len;
-+	int len, i;
-+	str ptype;
- 
- 	cp1 = NULL;
- 	for (cp = body->s; (len = body->s + body->len - cp) > 0;) {
-@@ -915,32 +1056,62 @@
- 		LOG(L_ERR, "ERROR: extract_mediaport: no `m=' in SDP\n");
- 		return -1;
- 	}
--	mediaport->s = cp1 + 2;
-+	mediaport->s = cp1 + 2; /* skip `m=' */
- 	mediaport->len = eat_line(mediaport->s, body->s + body->len -
- 	  mediaport->s) - mediaport->s;
- 	trim_len(mediaport->len, mediaport->s, *mediaport);
- 
--	if (mediaport->len > 6 && memcmp(mediaport->s, "audio", 5) == 0 &&
--	    isspace((int)mediaport->s[5])) {
--		mediaport->s += 5;
--		mediaport->len -= 5;
--	} else if (mediaport->len > 12 && memcmp(mediaport->s, "application", 11) == 0 &&
--	    isspace((int)mediaport->s[11])) {
--		mediaport->s += 11;
--		mediaport->len -= 11;
--	} else {
--		LOG(L_ERR, "ERROR: extract_mediaport: can't parse `m=' in SDP\n");
-+	/* Skip media supertype and spaces after it */
-+	cp = eat_token_end(mediaport->s, mediaport->s + mediaport->len);
-+	mediaport->len -= cp - mediaport->s;
-+	if (mediaport->len <= 0 || cp == mediaport->s) {
-+		LOG(L_ERR, "ERROR: extract_mediaport: no port in `m='\n");
- 		return -1;
- 	}
-+	mediaport->s = cp;
- 	cp = eat_space_end(mediaport->s, mediaport->s + mediaport->len);
--	mediaport->len = eat_token_end(cp, mediaport->s + mediaport->len) - cp;
-+	mediaport->len -= cp - mediaport->s;
-+	if (mediaport->len <= 0 || cp == mediaport->s) {
-+		LOG(L_ERR, "ERROR: extract_mediaport: no port in `m='\n");
-+		return -1;
-+	}
-+	/* Extract port */
- 	mediaport->s = cp;
--	return 1;
-+	cp = eat_token_end(mediaport->s, mediaport->s + mediaport->len);
-+	ptype.len = mediaport->len - (cp - mediaport->s);
-+	if (ptype.len <= 0 || cp == mediaport->s) {
-+		LOG(L_ERR, "ERROR: extract_mediaport: no port in `m='\n");
-+		return -1;
-+	}
-+	ptype.s = cp;
-+	mediaport->len = cp - mediaport->s;
-+	/* Skip spaces after port */
-+	cp = eat_space_end(ptype.s, ptype.s + ptype.len);
-+	ptype.len -= cp - ptype.s;
-+	if (ptype.len <= 0 || cp == ptype.s) {
-+		LOG(L_ERR, "ERROR: extract_mediaport: no protocol type in `m='\n");
-+		return -1;
-+	}
-+	/* Extract protocol type */
-+	ptype.s = cp;
-+	cp = eat_token_end(ptype.s, ptype.s + ptype.len);
-+	if (cp == ptype.s) {
-+		LOG(L_ERR, "ERROR: extract_mediaport: no protocol type in `m='\n");
-+		return -1;
-+	}
-+	ptype.len = cp - ptype.s;
-+
-+	for (i = 0; sup_ptypes[i].s != NULL; i++)
-+		if (ptype.len == sup_ptypes[i].len &&
-+		    strncasecmp(ptype.s, sup_ptypes[i].s, ptype.len) == 0)
-+			return 0;
-+	/* Unproxyable protocol type. Generally it isn't error. */
-+	return -1;
- }
- 
--static int
-+int
- alter_mediaip(struct sip_msg *msg, str *body, str *oldip, int oldpf,
--  str *newip, int newpf, int preserve)
-+  str *newip, int newpf, int flags)
- {
- 	char *buf;
- 	int offset;
-@@ -948,7 +1119,7 @@
- 	str omip, nip, oip;
- 
- 	/* check that updating mediaip is really necessary */
--	if (oldpf == newpf && isnulladdr(oldip, oldpf))
-+	if (oldpf == newpf && isnulladdr(oldip, oldpf) && !(flags & 2))
- 		return 0;
- 	if (newip->len == oldip->len &&
- 	    memcmp(newip->s, oldip->s, newip->len) == 0)
-@@ -961,7 +1132,7 @@
- 	 * another request comes.
- 	 */
- #if 0
--	/* disabled: 
-+	/* disabled:
- 	 *  - alter_mediaip is called twice if 2 c= lines are present
- 	 *    in the sdp (and we want to allow it)
- 	 *  - the message flags are propagated in the on_reply_route
-@@ -976,7 +1147,7 @@
- 	}
- #endif
- 
--	if (preserve != 0) {
-+	if ((flags & 1) != 0) {
- 		anchor = anchor_lump(msg, body->s + body->len - msg->buf, 0, 0);
- 		if (anchor == NULL) {
- 			LOG(L_ERR, "ERROR: alter_mediaip: anchor_lump failed\n");
-@@ -1052,7 +1223,7 @@
- 	return 0;
- }
- 
--static int
-+int
- alter_mediaport(struct sip_msg *msg, str *body, str *oldport, str *newport,
-   int preserve)
- {
-@@ -1128,6 +1299,161 @@
- 	return 0;
- }
- 
-+/*
-+ * Finds specified text in area [*pp...bodylimit) at line beginning.
-+ * Returns pointer to text, updates *pp to position after it.
-+ */
-+
-+static char*
-+find_sdp_text_bol(char **pp, char *plimit, char *text, size_t textlen)
-+{
-+	/* Find text at beginning of line */
-+	if (*pp == NULL)
-+		return NULL;
-+	for(;;) {
-+		char* p;
-+		if (*pp >= plimit)
-+			return NULL;
-+		if (!(p = ser_memmem(*pp, text, plimit - *pp, textlen))) {
-+			*pp = plimit;
-+			return NULL;
-+		}
-+		*pp = p + 1;
-+		if (p[-1] != '\n' && p[-1] != '\r')
-+			continue;
-+		return p;
-+	}
-+	/*UNREACHED*/
-+	return NULL;
-+}
-+
-+static int
-+fixate_sdp_f(struct sip_msg* msg, char* str1, char* str2)
-+{
-+	char *cp;
-+	int newpf;
-+	str body, newip, newport, dest, oldip, oldport;
-+	struct sip_uri ruri;
-+	struct hdr_field *hdr;
-+	struct via_body *rvia;
-+	char *bodylimit, *v1p, *v2p, *m1p, *m2p, *c1p, *c2p;
-+	char *om_ip_pos, *om_port_pos;
-+	int c1_altered;
-+
-+	if (msg->first_line.type == SIP_REQUEST &&
-+	    msg->first_line.u.request.method_value == METHOD_INVITE) {
-+		LOG(L_ERR, "DEBUG: fixate_sdp: request\n");
-+		if (msg->parsed_uri_ok) {
-+			dest = msg->parsed_uri.host;
-+		} else {
-+			if (parse_uri(msg->new_uri.s, msg->new_uri.len, &ruri) < 0) {
-+				LOG(L_ERR, "ERROR: fixate_sdp: can't parse request uri\n");
-+				return -1;
-+			}
-+			dest = ruri.host;
-+		}
-+	} else if (msg->first_line.type == SIP_REPLY) {
-+		LOG(L_ERR, "DEBUG: fixate_sdp: reply\n");
-+		rvia = NULL;
-+		for (hdr=msg->headers; hdr; hdr=hdr->next) {
-+			if (hdr->type == HDR_VIA)
-+				rvia = hdr->parsed;
-+		}
-+		if (rvia == NULL) {
-+			LOG(L_ERR, "ERROR: fixate_sdp: no or incorrect Via in reply\n");
-+			return -1;
-+		}
-+		if (rvia->received != NULL) {
-+			dest = rvia->received->value;
-+		} else {
-+			dest = rvia->host;
-+		}
-+	} else {
-+		return -1;
-+	}
-+
-+	if (extract_body(msg, &body) == -1 || body.len == 0) {
-+		LOG(L_ERR, "ERROR: fixate_sdp: can't extract body "
-+		    "from the message\n");
-+		return -1;
-+	}
-+	bodylimit = body.s + body.len;
-+	v2p = v1p = find_sdp_line(body.s, bodylimit, 'v');
-+	if (!v1p) {
-+		LOG(L_ERR, "fixate_sdp: no sessions found\n");
-+		return -1;
-+	}
-+	om_ip_pos = body.s;
-+	om_port_pos = body.s;
-+	for(;;) {
-+		v1p = v2p;
-+		if (v1p == NULL || v1p >= bodylimit)
-+			break;
-+		v2p = find_next_sdp_line(v1p, bodylimit, 'v', bodylimit);
-+		m2p = m1p = find_sdp_line(v1p, v2p, 'm');
-+		c1p = find_sdp_line(v1p, v2p, 'c');
-+		c1_altered = 0;
-+		if (!m1p) {
-+			LOG(L_ERR, "fixate_sdp: session without media\n");
-+			return -1;
-+		}
-+		for(;;) {
-+			str tmpstr1;
-+			m1p = m2p;
-+			if (m1p == NULL || m1p >= v2p)
-+				break;
-+			m2p = find_next_sdp_line(m1p, v2p, 'm', v2p);
-+			c2p = find_sdp_line(m1p, m2p, 'c');
-+			/* Set old port and IP. Order doesn't matter. */
-+			tmpstr1.s = m1p;
-+			tmpstr1.len = bodylimit - m1p;
-+			if (extract_mediaport(&tmpstr1, &newport) == -1) {
-+				LOG(L_ERR, "ERROR: fixate_sdp: can't extract media port from the SDP\n");
-+				return -1;
-+			}
-+			cp = find_sdp_text_bol(&om_port_pos, bodylimit, AOLDMEDPRT, AOLDMEDPRT_LEN);
-+			if (cp) {
-+				oldport.s = cp + AOLDMEDPRT_LEN;
-+				oldport.len = eat_line(oldport.s, bodylimit - oldport.s) - oldport.s;
-+				trim_len(oldport.len, oldport.s, oldport);
-+				if (oldport.len != 0 &&
-+				    alter_mediaport(msg, &body, &newport, &oldport, 0) == -1)
-+					return -1;
-+			}
-+			if (c2p || !c1_altered) {
-+				tmpstr1.s = c2p ? c2p : c1p;
-+				tmpstr1.len = bodylimit - tmpstr1.s;
-+				if (extract_mediaip(&tmpstr1, &newip, &newpf) == -1) {
-+					LOG(L_ERR, "ERROR: fixate_sdp: can't extract media IP from the SDP\n");
-+					return -1;
-+				}
-+				if (newip.len != dest.len || memcmp(newip.s, dest.s, dest.len) != 0 ||
-+				    isnulladdr(&newip, newpf))
-+					return -1;
-+				cp = find_sdp_text_bol(&om_ip_pos, bodylimit, AOLDMEDIP, AOLDMEDIP_LEN);
-+				if (cp) {
-+					oldip.s = cp + AOLDMEDIP_LEN;
-+					oldip.len = eat_line(oldip.s, bodylimit - oldip.s) - oldip.s;
-+					trim_len(oldip.len, oldip.s, oldip);
-+				}
-+				if (newip.len == oldip.len &&
-+				    memcmp(newip.s, oldip.s, newip.len) == 0)
-+					oldip.len = 0;
-+						
-+				if (oldip.len != 0) {
-+					if (alter_mediaip(msg, &body, &newip, newpf, &oldip, AF_INET,
-+					    0) == -1)
-+						return -1;
-+				}
-+				if (!c2p)
-+					c1_altered = 1;
-+			} /* if rewrite IP */
-+		} /* medias */
-+	} /* sessions */
-+
-+	return 1;
-+}
-+
- static char *
- gencookie()
- {
-@@ -1139,45 +1465,58 @@
- }
- 
- static int
--rtpp_test(int isdisabled, int force)
-+rtpp_test(struct rtpp_node *node, int isdisabled, int force)
- {
- 	int rtpp_ver;
--	static int recheck_ticks = 0;
- 	char *cp;
- 	struct iovec v[2] = {{NULL, 0}, {"V", 1}};
-+	struct iovec vf[4] = {{NULL, 0}, {"VF", 2}, {" ", 1},
-+	    {REQ_CPROTOVER, 8}};
- 
- 	if (force == 0) {
- 		if (isdisabled == 0)
- 			return 0;
--		if (recheck_ticks > get_ticks())
-+		if (node->rn_recheck_ticks > get_ticks())
- 			return 1;
- 	}
--	cp = send_rtpp_command(v, 2);
--	if (cp == NULL) {
--		LOG(L_WARN,"WARNING: rtpp_test: can't get version of "
--		    "the RTP proxy\n");
--	} else {
-+	do {
-+		cp = send_rtpp_command(node, v, 2);
-+		if (cp == NULL) {
-+			LOG(L_WARN,"WARNING: rtpp_test: can't get version of "
-+			    "the RTP proxy\n");
-+			break;
-+		}
- 		rtpp_ver = atoi(cp);
--		if (rtpp_ver == SUP_CPROTOVER) {
--			LOG(L_INFO, "rtpp_test: RTP proxy found, support for "
--			    "it %senabled\n", force == 0 ? "re-" : "");
--			return 0;
-+		if (rtpp_ver != SUP_CPROTOVER) {
-+			LOG(L_WARN, "WARNING: rtpp_test: unsupported "
-+			    "version of RTP proxy <%s> found: %d supported, "
-+			    "%d present\n", node->rn_url,
-+			    SUP_CPROTOVER, rtpp_ver);
-+			break;
- 		}
--		LOG(L_WARN, "WARNING: rtpp_test: unsupported "
--		    "version of RTP proxy found: %d supported, "
--		    "%d present\n", SUP_CPROTOVER, rtpp_ver);
--	}
--	LOG(L_WARN, "WARNING: rtpp_test: support for RTP proxy "
--	    "has been disabled%s\n",
-+		cp = send_rtpp_command(node, vf, 4);
-+		if (cp[0] == 'E' || atoi(cp) != 1) {
-+			LOG(L_WARN, "WARNING: rtpp_test: of RTP proxy <%s>"
-+			    "doesn't support required protocol version %s\n",
-+			    node->rn_url, REQ_CPROTOVER);
-+			break;
-+		}
-+		LOG(L_INFO, "rtpp_test: RTP proxy <%s> found, support for "
-+		    "it %senabled\n",
-+		    node->rn_url, force == 0 ? "re-" : "");
-+		return 0;
-+	} while(0);
-+	LOG(L_WARN, "WARNING: rtpp_test: support for RTP proxy <%s>"
-+	    "has been disabled%s\n", node->rn_url,
- 	    rtpproxy_disable_tout < 0 ? "" : " temporarily");
- 	if (rtpproxy_disable_tout >= 0)
--		recheck_ticks = get_ticks() + rtpproxy_disable_tout;
-+		node->rn_recheck_ticks = get_ticks() + rtpproxy_disable_tout;
- 
- 	return 1;
- }
- 
--static char *
--send_rtpp_command(struct iovec *v, int vcnt)
-+char *
-+send_rtpp_command(struct rtpp_node *node, struct iovec *v, int vcnt)
- {
- 	struct sockaddr_un addr;
- 	int fd, len, i;
-@@ -1187,10 +1526,10 @@
- 
- 	len = 0;
- 	cp = buf;
--	if (umode == 0) {
-+	if (node->rn_umode == 0) {
- 		memset(&addr, 0, sizeof(addr));
- 		addr.sun_family = AF_LOCAL;
--		strncpy(addr.sun_path, rtpproxy_sock,
-+		strncpy(addr.sun_path, node->rn_address,
- 		    sizeof(addr.sun_path) - 1);
- #ifdef HAVE_SOCKADDR_SA_LEN
- 		addr.sun_len = strlen(addr.sun_path);
-@@ -1199,12 +1538,12 @@
- 		fd = socket(AF_LOCAL, SOCK_STREAM, 0);
- 		if (fd < 0) {
- 			LOG(L_ERR, "ERROR: send_rtpp_command: can't create socket\n");
--			return NULL;
-+			goto badproxy;
- 		}
- 		if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- 			close(fd);
- 			LOG(L_ERR, "ERROR: send_rtpp_command: can't connect to RTP proxy\n");
--			return NULL;
-+			goto badproxy;
- 		}
- 
- 		do {
-@@ -1213,7 +1552,7 @@
- 		if (len <= 0) {
- 			close(fd);
- 			LOG(L_ERR, "ERROR: send_rtpp_command: can't send command to a RTP proxy\n");
--			return NULL;
-+			goto badproxy;
- 		}
- 		do {
- 			len = read(fd, buf, sizeof(buf) - 1);
-@@ -1221,38 +1560,38 @@
- 		close(fd);
- 		if (len <= 0) {
- 			LOG(L_ERR, "ERROR: send_rtpp_command: can't read reply from a RTP proxy\n");
--			return NULL;
-+			goto badproxy;
- 		}
- 	} else {
--		fds[0].fd = controlfd;
-+		fds[0].fd = node->rn_fd;
- 		fds[0].events = POLLIN;
- 		fds[0].revents = 0;
- 		/* Drain input buffer */
- 		while ((poll(fds, 1, 0) == 1) &&
- 		    ((fds[0].revents & POLLIN) != 0)) {
--			recv(controlfd, buf, sizeof(buf) - 1, 0);
-+			recv(node->rn_fd, buf, sizeof(buf) - 1, 0);
- 			fds[0].revents = 0;
- 		}
- 		v[0].iov_base = gencookie();
- 		v[0].iov_len = strlen(v[0].iov_base);
- 		for (i = 0; i < rtpproxy_retr; i++) {
- 			do {
--				len = writev(controlfd, v, vcnt);
-+				len = writev(node->rn_fd, v, vcnt);
- 			} while (len == -1 && (errno == EINTR || errno == ENOBUFS));
- 			if (len <= 0) {
- 				LOG(L_ERR, "ERROR: send_rtpp_command: "
- 				    "can't send command to a RTP proxy\n");
--				return NULL;
-+				goto badproxy;
- 			}
- 			while ((poll(fds, 1, rtpproxy_tout * 1000) == 1) &&
- 			    (fds[0].revents & POLLIN) != 0) {
- 				do {
--					len = recv(controlfd, buf, sizeof(buf) - 1, 0);
-+					len = recv(node->rn_fd, buf, sizeof(buf) - 1, 0);
- 				} while (len == -1 && errno == EINTR);
- 				if (len <= 0) {
- 					LOG(L_ERR, "ERROR: send_rtpp_command: "
- 					    "can't read reply from a RTP proxy\n");
--					return NULL;
-+					goto badproxy;
- 				}
- 				if (len >= (v[0].iov_len - 1) &&
- 				    memcmp(buf, v[0].iov_base, (v[0].iov_len - 1)) == 0) {
-@@ -1270,28 +1609,97 @@
- 		if (i == rtpproxy_retr) {
- 			LOG(L_ERR, "ERROR: send_rtpp_command: "
- 			    "timeout waiting reply from a RTP proxy\n");
--			return NULL;
-+			goto badproxy;
- 		}
- 	}
- 
- out:
- 	cp[len] = '\0';
- 	return cp;
-+badproxy:
-+	LOG(L_ERR, "send_rtpp_command(): proxy <%s> does not responding, disable it\n", node->rn_url);
-+	node->rn_disabled = 1;
-+	node->rn_recheck_ticks = get_ticks() + rtpproxy_disable_tout;
-+	return NULL;
-+}
-+
-+/*
-+ * Main balancing routine. This does not try to keep the same proxy for
-+ * the call if some proxies were disabled or enabled; proxy death considered
-+ * too rare. Otherwise we should implement "mature" HA clustering, which is
-+ * too expensive here.
-+ */
-+struct rtpp_node *
-+select_rtpp_node(str callid, int do_test)
-+{
-+	unsigned sum, sumcut, weight_sum;
-+	struct rtpp_node* node;
-+	int was_forced;
-+
-+	/* Most popular case: 1 proxy, nothing to calculate */
-+	if (rtpp_node_count == 1) {
-+		node = rtpp_list.rn_first;
-+		return node->rn_disabled ? NULL : node;
-+	}
-+
-+	/* XXX Use quick-and-dirty hashing algo */
-+	for(sum = 0; callid.len > 0; callid.len--)
-+		sum += callid.s[callid.len - 1];
-+	sum &= 0xff;
-+
-+	was_forced = 0;
-+retry:
-+	weight_sum = 0;
-+	for (node = rtpp_list.rn_first; node != NULL; node = node->rn_next) {
-+		if (node->rn_disabled) {
-+			/* Try to enable if it's time to try. */
-+			if (node->rn_recheck_ticks <= get_ticks())
-+				node->rn_disabled = rtpp_test(node, 1, 0);
-+		}
-+		if (!node->rn_disabled)
-+			weight_sum += node->rn_weight;
-+	}
-+	if (weight_sum == 0) {
-+		/* No proxies? Force all to be redetected, if not yet */
-+		if (was_forced)
-+			return NULL;
-+		was_forced = 1;
-+		for (node = rtpp_list.rn_first; node != NULL; node = node->rn_next) {
-+			node->rn_disabled = rtpp_test(node, 1, 1);
-+		}
-+		goto retry;
-+	}
-+	sumcut = sum % weight_sum;
-+	/*
-+	 * sumcut here lays from 0 to weight_sum-1.
-+	 * Scan proxy list and decrease until appropriate proxy is found.
-+	 */
-+	for (node = rtpp_list.rn_first; node != NULL; node = node->rn_next) {
-+		if (node->rn_disabled)
-+			continue;
-+		if (sumcut < node->rn_weight)
-+			goto found;
-+		sumcut -= node->rn_weight;
-+	}
-+	/* No node list */
-+	return NULL;
-+found:
-+	if (do_test) {
-+		node->rn_disabled = rtpp_test(node, node->rn_disabled, 0);
-+		if (node->rn_disabled)
-+			goto retry;
-+	}
-+	return node;
- }
- 
- static int
- unforce_rtp_proxy_f(struct sip_msg* msg, char* str1, char* str2)
- {
- 	str callid, from_tag, to_tag;
-+	struct rtpp_node *node;
- 	struct iovec v[1 + 4 + 3] = {{NULL, 0}, {"D", 1}, {" ", 1}, {NULL, 0}, {" ", 1}, {NULL, 0}, {" ", 1}, {NULL, 0}};
- 						/* 1 */   /* 2 */   /* 3 */    /* 4 */   /* 5 */    /* 6 */   /* 1 */
- 
--	rtpproxy_disable = rtpp_test(rtpproxy_disable, 0);
--	if (rtpproxy_disable != 0) {
--		LOG(L_ERR, "ERROR: unforce_rtp_proxy: support for RTP proxy "
--		    "is disabled\n");
--		return -1;
--	}
- 	if (get_callid(msg, &callid) == -1 || callid.len == 0) {
- 		LOG(L_ERR, "ERROR: unforce_rtp_proxy: can't get Call-Id field\n");
- 		return -1;
-@@ -1307,29 +1715,185 @@
- 	STR2IOVEC(callid, v[3]);
- 	STR2IOVEC(from_tag, v[5]);
- 	STR2IOVEC(to_tag, v[7]);
--	send_rtpp_command(v, (to_tag.len > 0) ? 8 : 6);
-+	node = select_rtpp_node(callid, 1);
-+	if (!node) {
-+		LOG(L_ERR, "ERROR: unforce_rtp_proxy: no available proxies\n");
-+		return -1;
-+	}
-+	send_rtpp_command(node, v, (to_tag.len > 0) ? 8 : 6);
-+
-+	return 1;
-+}
-+
-+static int
-+start_recording_f(struct sip_msg* msg, char* str1, char* str2)
-+{
-+	int nitems;
-+	str callid, from_tag, to_tag;
-+	struct rtpp_node *node;
-+	struct iovec v[1 + 4 + 3] = {{NULL, 0}, {"R", 1}, {" ", 1}, {NULL, 0}, {" ", 1}, {NULL, 0}, {" ", 1}, {NULL, 0}};
-+						/* 1 */   /* 2 */   /* 3 */    /* 4 */   /* 5 */    /* 6 */   /* 1 */
-+
-+	if (get_callid(msg, &callid) == -1 || callid.len == 0) {
-+		LOG(L_ERR, "ERROR: start_recording: can't get Call-Id field\n");
-+		return -1;
-+	}
-+	if (get_to_tag(msg, &to_tag) == -1) {
-+		LOG(L_ERR, "ERROR: start_recording: can't get To tag\n");
-+		return -1;
-+	}
-+	if (get_from_tag(msg, &from_tag) == -1 || from_tag.len == 0) {
-+		LOG(L_ERR, "ERROR: start_recording: can't get From tag\n");
-+		return -1;
-+	}
-+	STR2IOVEC(callid, v[3]);
-+	STR2IOVEC(from_tag, v[5]);
-+	STR2IOVEC(to_tag, v[7]);
-+	node = select_rtpp_node(callid, 1);
-+	if (!node) {
-+		LOG(L_ERR, "ERROR: start_recording: no available proxies\n");
-+		return -1;
-+	}
-+	nitems = 8;
-+	if (msg->first_line.type == SIP_REPLY) {
-+		if (to_tag.len == 0)
-+			return -1;
-+		STR2IOVEC(to_tag, v[5]);
-+		STR2IOVEC(from_tag, v[7]);
-+	} else {
-+		STR2IOVEC(from_tag, v[5]);
-+		STR2IOVEC(to_tag, v[7]);
-+		if (to_tag.len <= 0)
-+			nitems = 6;
-+	}
-+	send_rtpp_command(node, v, nitems);
-+
-+	return 1;
-+}
-+
-+/*
-+ * Auxiliary for some functions.
-+ * Returns pointer to first character of found line, or NULL if no such line.
-+ */
-+
-+char*
-+find_sdp_line(char *p, char *plimit, char linechar)
-+{
-+	static char linehead[3] = "x=";
-+	char *cp, *cp1;
-+	linehead[0] = linechar;
-+	/* Iterate thru body */
-+	cp = p;
-+	for (;;) {
-+		if (cp >= plimit)
-+			return NULL;
-+		cp1 = ser_memmem(cp, linehead, plimit-cp, 2);
-+		if (cp1 == NULL)
-+			return NULL;
-+		/*
-+		 * As it is body, we assume it has previous line and we can
-+		 * lookup previous character.
-+		 */
-+		if (cp1[-1] == '\n' || cp1[-1] == '\r')
-+			return cp1;
-+		/*
-+		 * Having such data, but not at line beginning.
-+		 * Skip them and reiterate. ser_memmem() will find next
-+		 * occurrence.
-+		 */
-+		if (plimit - cp1 < 2)
-+			return NULL;
-+		cp = cp1 + 2;
-+	}
-+	/*UNREACHED*/
-+	return NULL;
-+}
-+
-+/* This function assumes p points to a line of requested type. */
- 
-+char*
-+find_next_sdp_line(char *p, char *plimit, char linechar, char *defptr)
-+{
-+	char* t;
-+	if (p >= plimit || plimit - p < 3)
-+		return defptr;
-+	t = find_sdp_line(p + 2, plimit, linechar);
-+	return t ? t : defptr;
-+}
-+
-+static int
-+alter_line(struct sip_msg *msg, str *where, str *what)
-+{
-+	struct lump *anchor;
-+	anchor = del_lump(msg, where->s - msg->buf, where->len, 0);
-+	if (!anchor) {
-+		LOG(L_ERR, "del_lump() failed\n");
-+		return 0;
-+	}
-+	if (insert_new_lump_after(anchor, what->s, what->len, 0) == 0) {
-+		LOG(L_ERR, "insert_new_lump_after() failed\n");
-+		return 0;
-+	}
- 	return 1;
- }
- 
-+/*
-+ * The following macro is used in force_rtp_proxy2_f() and twice
-+ * in start_moh() 
-+ */
-+
-+#define PARSE_PROXY_REPLY \
-+		 do { \
-+			argc = 0;	\
-+			memset(argv, 0, sizeof(argv));	\
-+			cpend=cp+strlen(cp);	\
-+			next=eat_token_end(cp, cpend);	\
-+			for (ap = argv; cp<cpend; cp=next+1, next=eat_token_end(cp, cpend)){	\
-+				*next=0;	\
-+				if (*cp != '\0') {	\
-+					*ap=cp;	\
-+					argc++;	\
-+					if ((char*)++ap >= ((char*)argv+sizeof(argv)))	\
-+						break;	\
-+				}	\
-+			} \
-+		} while(0)
-+
- static int
- force_rtp_proxy2_f(struct sip_msg* msg, char* str1, char* str2)
- {
--	str body, body1, oldport, oldip, oldip1, newport, newip;
--	str callid, from_tag, to_tag, tmp;
-+	str body, body1, oldport, oldip, newport, newip;
-+	str callid, from_tag, to_tag;
- 	int create, port, len, asymmetric, flookup, argc, proxied, real;
-+	int create1;
- 	int oidx, pf, pf1, force;
- 	char opts[16];
- 	char *cp, *cp1;
- 	char  *cpend, *next;
- 	char **ap, *argv[10];
- 	struct lump* anchor;
--	struct iovec v[1 + 6 + 5] = {{NULL, 0}, {NULL, 0}, {" ", 1}, {NULL, 0},
--		{" ", 1}, {NULL, 7}, {" ", 1}, {NULL, 1}, {" ", 1}, {NULL, 0},
--		{" ", 1}, {NULL, 0}};
--						/* 1 */    /* 2 */   /* 3 */    /* 4 */
--		/* 5 */    /* 6 */   /* 7 */    /* 8 */   /* 9 */    /* 10 */
--		/* 11 */
-+	struct rtpp_node *node;
-+	struct iovec v[14] = {
-+		{NULL, 0},	/* command */
-+		{NULL, 0},	/* options */
-+		{" ", 1},	/* separator */
-+		{NULL, 0},	/* callid */
-+		{" ", 1},	/* separator */
-+		{NULL, 7},	/* newip */
-+		{" ", 1},	/* separator */
-+		{NULL, 1},	/* oldport */
-+		{" ", 1},	/* separator */
-+		{NULL, 0},	/* from_tag */
-+		{";", 1},	/* separator */
-+		{NULL, 0},	/* medianum */
-+		{" ", 1},	/* separator */
-+		{NULL, 0}	/* to_tag */
-+	};
-+	char *v1p, *v2p, *c1p, *c2p, *m1p, *m2p, *bodylimit;
-+	char medianum_buf[20];
-+	int medianum, media_multi;
-+	str medianum_str, tmpstr1;
-+	int c1_altered;
- 
- 	v[1].iov_base=opts;
- 	asymmetric = flookup = force = real = 0;
-@@ -1374,13 +1938,6 @@
- 		}
- 	}
- 
--	rtpproxy_disable = rtpp_test(rtpproxy_disable, 0);
--	if (rtpproxy_disable != 0) {
--		LOG(L_ERR, "ERROR: force_rtp_proxy2: support for RTP proxy "
--		    "is disabled\n");
--		return -1;
--	}
--
- 	if (msg->first_line.type == SIP_REQUEST &&
- 	    msg->first_line.u.request.method_value == METHOD_INVITE) {
- 		create = 1;
-@@ -1409,14 +1966,7 @@
- 		LOG(L_ERR, "ERROR: force_rtp_proxy2: can't get From tag\n");
- 		return -1;
- 	}
--	if (flookup != 0) {
--		if (create == 0 || to_tag.len == 0)
--			return -1;
--		create = 0;
--		tmp = from_tag;
--		from_tag = to_tag;
--		to_tag = tmp;
--	}
-+
- 	proxied = 0;
- 	for (cp = body.s; (len = body.s + body.len - cp) >= ANORTPPROXY_LEN;) {
- 		cp1 = ser_memmem(cp, ANORTPPROXY, len, ANORTPPROXY_LEN);
-@@ -1430,88 +1980,207 @@
- 	}
- 	if (proxied != 0 && force == 0)
- 		return -1;
--	if (extract_mediaip(&body, &oldip, &pf) == -1) {
--		LOG(L_ERR, "ERROR: force_rtp_proxy2: can't extract media IP "
--		    "from the message\n");
--		return -1;
--	}
--	if (asymmetric != 0 || real != 0) {
--		newip = oldip;
--	} else {
--		newip.s = ip_addr2a(&msg->rcv.src_ip);
--		newip.len = strlen(newip.s);
--	}
--	body1.s = oldip.s + oldip.len;
--	body1.len = body.s + body.len - body1.s;
--	if (extract_mediaip(&body1, &oldip1, &pf1) == -1) {
--		oldip1.len = 0;
--	}
--	if (oldip1.len > 0 && pf != pf1) {
--		LOG(L_ERR, "ERROR: force_rtp_proxy2: mismatching address "
--		    "families in SDP\n");
--		return -1;
--	}
--	if (extract_mediaport(&body, &oldport) == -1) {
--		LOG(L_ERR, "ERROR: force_rtp_proxy2: can't extract media port "
--		    "from the message\n");
-+	/*
-+	 * Parsing of SDP body.
-+	 * It can contain a few session descriptions (each start with
-+	 * "v=" line), and each session may contain a few media descriptions
-+	 * (each start with "m=" line).
-+	 * We have to change ports in "m=", and also change IP addresses in
-+	 * "c=" which can be placed either in session header (fallback for
-+	 * all medias) or media description.
-+	 * Ports should be allocated for any media. IPs all should be changed
-+	 * to the same value (RTP proxy IP), so we can change all "c="
-+	 * unconditionally.
-+	 */
-+	bodylimit = body.s + body.len;
-+	v1p = find_sdp_line(body.s, bodylimit, 'v');
-+	if (v1p == NULL) {
-+		LOG(L_ERR, "ERROR: force_rtp_proxy2: no sessions in SDP\n");
- 		return -1;
- 	}
--	if (pf == AF_INET6) {
--		opts[oidx] = '6';
--		oidx++;
--	}
--	opts[0] = (create == 0) ? 'L' : 'U';
--	v[1].iov_len = oidx;
--	STR2IOVEC(callid, v[3]);
--	STR2IOVEC(newip, v[5]);
--	STR2IOVEC(oldport, v[7]);
--	STR2IOVEC(from_tag, v[9]);
--	STR2IOVEC(to_tag, v[11]);
--	cp = send_rtpp_command(v, (to_tag.len > 0) ? 12 : 10);
--	if (cp == NULL)
--		return -1;
--	argc = 0;
--	memset(argv, 0, sizeof(argv));
--	cpend=cp+strlen(cp);
--	next=eat_token_end(cp, cpend);
--	for (ap = argv; cp<cpend; cp=next+1, next=eat_token_end(cp, cpend)){
--		*next=0;
--		if (*cp != '\0') {
--			*ap=cp;
--			argc++;
--			if ((char*)++ap >= ((char*)argv+sizeof(argv)))
--				break;
-+	v2p = find_next_sdp_line(v1p, bodylimit, 'v', bodylimit);
-+	media_multi = (v2p != bodylimit);
-+	v2p = v1p;
-+	medianum = 0;
-+	for (;;) {
-+		unsigned nmseen, nmchanged;
-+		/* Per-session iteration. */
-+		v1p = v2p;
-+		if (v1p == NULL || v1p >= bodylimit)
-+			break; /* No sessions left */
-+		v2p = find_next_sdp_line(v1p, bodylimit, 'v', bodylimit);
-+		/* v2p is text limit for session parsing. */
-+		m1p = find_sdp_line(v1p, v2p, 'm');
-+		/* Have this session media description? */
-+		if (m1p == NULL) {
-+			LOG(L_ERR, "ERROR: force_rtp_proxy2: no m= in session\n");
-+			return -1;
- 		}
--	}
--	if (argc < 1)
--		return -1;
--	port = atoi(argv[0]);
--	if (port <= 0 || port > 65535)
--		return -1;
-+		/*
-+		 * Find c1p only between session begin and first media.
-+		 * c1p will give common c= for all medias.
-+		 */
-+		c1p = find_sdp_line(v1p, m1p, 'c');
-+		c1_altered = 0;
-+		/* Have session. Iterate media descriptions in session */
-+		m2p = m1p;
-+		nmseen = nmchanged = 0;
-+		for (;;) {
-+			create1 = create;
-+			if (flookup != 0) {
-+				if (!create || to_tag.len <= 0) {
-+#if 0
-+					LOG(L_ERR, "force_rtp_proxy(): inappropriate 'l'\n");
-+#endif
-+					return -1;
-+				}
-+				create1 = 0;
-+			}
-+			m1p = m2p;
-+			if (m1p == NULL || m1p >= v2p)
-+				break;
-+			m2p = find_next_sdp_line(m1p, v2p, 'm', v2p);
-+			/* c2p will point to per-media "c=" */
-+			c2p = find_sdp_line(m1p, m2p, 'c');
-+			/* Extract address and port */
-+			tmpstr1.s = c2p ? c2p : c1p;
-+			++nmseen;
-+			if (tmpstr1.s == NULL) {
-+				/* No "c=" */
-+				LOG(L_ERR, "ERROR: force_rtp_proxy2: can't find media IP "
-+				    "in the message\n");
-+				return -1;
-+			}
-+			tmpstr1.len = v2p - tmpstr1.s; /* limit is session limit text */
-+			if (extract_mediaip(&tmpstr1, &oldip, &pf) == -1) {
-+				LOG(L_ERR, "ERROR: force_rtp_proxy2: can't extract media IP "
-+				    "from the message\n");
-+				return -1;
-+			}
-+			tmpstr1.s = m1p;
-+			tmpstr1.len = m2p - m1p;
-+			if (extract_mediaport(&tmpstr1, &oldport) == -1) {
-+				LOG(L_ERR, "ERROR: force_rtp_proxy2: can't extract media port "
-+				    "from the message\n");
-+				return -1;
-+			}
-+			++medianum;
-+			if (asymmetric != 0 || real != 0) {
-+				newip = oldip;
-+			} else {
-+				newip.s = ip_addr2a(&msg->rcv.src_ip);
-+				newip.len = strlen(newip.s);
-+			}
-+			/* XXX must compare address families in all addresses */
-+			if (pf == AF_INET6) {
-+				opts[oidx] = '6';
-+				oidx++;
-+			}
-+			snprintf(medianum_buf, sizeof medianum_buf, "%d", medianum);
-+			medianum_str.s = medianum_buf;
-+			medianum_str.len = strlen(medianum_buf);
-+			opts[0] = (create1 == 0) ? 'L' : 'U';
-+			v[1].iov_len = oidx;
-+			STR2IOVEC(callid, v[3]);
-+			STR2IOVEC(newip, v[5]);
-+			STR2IOVEC(oldport, v[7]);
-+			/*assert(!flookup || to_tag.len > 0);*/
-+			STR2IOVEC(flookup ? to_tag : from_tag, v[9]);
-+			if (1 || media_multi) /* XXX */ {
-+				STR2IOVEC(medianum_str, v[11]);
-+			} else {
-+				v[10].iov_len = v[11].iov_len = 0;
-+			}
-+			STR2IOVEC(flookup ? from_tag : to_tag, v[13]);
-+			do {
-+				node = select_rtpp_node(callid, 1);
-+				if (!node) {
-+					LOG(L_ERR, "ERROR: force_rtp_proxy2: no available proxies\n");
-+					return -1;
-+				}
-+				cp = send_rtpp_command(node, v,
-+				    (to_tag.len > 0) ? 14 : 12);
-+			} while (cp == NULL);
-+			LOG(L_DBG, "force_rtp_proxy2: proxy reply: %s\n", cp);
-+			PARSE_PROXY_REPLY;
-+			if (argc < 1) {
-+				LOG(L_ERR, "force_rtp_proxy2: no reply from rtp proxy\n");
-+				return -1;
-+			}
-+			port = atoi(argv[0]);
-+			if (port <= 0 || port > 65535) {
-+				/*
-+				 * In forced lookup mode absence of session indicated
-+				 * by port number being zero is not an error condition
-+				 * but merely of indication that there is no such
-+				 * session in the proxy exists.
-+				 */
-+				if (port != 0 || flookup == 0)
-+					LOG(L_ERR, "force_rtp_proxy2: incorrect port in reply from rtp proxy\n");
-+				return -1;
-+			}
- 
--	pf1 = (argc >= 3 && argv[2][0] == '6') ? AF_INET6 : AF_INET;
-+			pf1 = (argc >= 3 && argv[2][0] == '6') ? AF_INET6 : AF_INET;
- 
--	if (isnulladdr(&oldip, pf)) {
--		if (pf1 == AF_INET6) {
--			newip.s = "::";
--			newip.len = 2;
--		} else {
--			newip.s = "0.0.0.0";
--			newip.len = 7;
-+			if (isnulladdr(&oldip, pf)) {
-+				if (pf1 == AF_INET6) {
-+					newip.s = "::";
-+					newip.len = 2;
-+				} else {
-+					newip.s = "0.0.0.0";
-+					newip.len = 7;
-+				}
-+			} else {
-+				newip.s = (argc < 2) ? str2 : argv[1];
-+				newip.len = strlen(newip.s);
-+			}
-+			newport.s = int2str(port, &newport.len); /* beware static buffer */
-+			/* Alter port. */
-+			body1.s = m1p;
-+			body1.len = bodylimit - body1.s;
-+			if (alter_mediaport(msg, &body1, &oldport, &newport, 0) == -1)
-+				return -1;
-+			/*
-+			 * Alter IP. Don't alter IP common for the session
-+			 * more than once.
-+			 */
-+			if (c2p != NULL || !c1_altered) {
-+				body1.s = c2p ? c2p : c1p;
-+				body1.len = bodylimit - body1.s;
-+				if (alter_mediaip(msg, &body1, &oldip, pf, &newip, pf1, 0) == -1)
-+					return -1;
-+				if (!c2p)
-+					c1_altered = 1;
-+			}
-+			++nmchanged;
-+			/*
-+			 * Gross hack: turn off flookup here, after first
-+			 * media stream. This is used to allow changing number
-+			 * of media streams during re-INVITE.
-+			 */
-+			flookup = 0;
-+		} /* Iterate medias in session */
-+		if (c1p && nmseen == nmchanged && !c1_altered) {
-+			/* Alter default c-line of this session. */
-+			str c1s, janus;
-+			size_t newlen;
-+			c1s.s = c1p;
-+			c1s.len = eat_line(c1p, bodylimit - c1p) - c1p;
-+			newlen = c1s.len + 6 + 1;
-+			janus.s = pkg_malloc(c1s.len);
-+			if (janus.s == NULL) {
-+				LOG(L_ERR, "pkg_malloc failed\n");
-+				return 0;
-+			}
-+			sprintf(janus.s, "a=oldc:%*.*s",
-+			    (int) c1s.len, (int) c1s.len, c1s.s);
-+			janus.len = strlen(janus.s);
-+			if (alter_line(msg, &c1s, &janus) <= 0) {
-+				LOG(L_ERR, "alter_line() failed\n");
-+				return 0;
-+			}
- 		}
--	} else {
--		newip.s = (argc < 2) ? str2 : argv[1];
--		newip.len = strlen(newip.s);
--	}
--	newport.s = int2str(port, &newport.len); /* beware static buffer */
--
--	if (alter_mediaip(msg, &body, &oldip, pf, &newip, pf1, 0) == -1)
--		return -1;
--	if (oldip1.len > 0 &&
--	    alter_mediaip(msg, &body1, &oldip1, pf, &newip, pf1, 0) == -1)
--		return -1;
--	if (alter_mediaport(msg, &body, &oldport, &newport, 0) == -1)
--		return -1;
-+	} /* Iterate sessions */
- 
- 	if (proxied == 0) {
- 		cp = pkg_malloc(ANORTPPROXY_LEN * sizeof(char));
-@@ -1555,75 +2224,41 @@
- 	return force_rtp_proxy1_f(msg, arg, NULL);
- }
- 
--static void
--timer(unsigned int ticks, void *param)
-+static int
-+rewrite_from_from_f(struct sip_msg* msg, char* str1, char* str2)
- {
--	int rval;
--	void *buf, *cp;
--	str c;
--	struct sip_uri curi;
--	union sockaddr_union to;
--	struct hostent* he;
--	struct socket_info* send_sock;
-+	struct action act;
-+	struct sip_uri uri;
-+	str ruri;
- 
--	buf = NULL;
--	if (cblen > 0) {
--		buf = pkg_malloc(cblen);
--		if (buf == NULL) {
--			LOG(L_ERR, "ERROR: nathelper::timer: out of memory\n");
--			return;
--		}
-+	/* parsing from header */
-+	if (parse_from_header(msg) == -1) {
-+		LOG(L_ERR, "rewrite_from_from(): cannot get FROM header\n");
-+		return -1;
- 	}
--	rval = ul.get_all_ucontacts(buf, cblen, (ping_nated_only ? FL_NAT : 0));
--	if (rval > 0) {
--		if (buf != NULL)
--			pkg_free(buf);
--		cblen = rval * 2;
--		buf = pkg_malloc(cblen);
--		if (buf == NULL) {
--			LOG(L_ERR, "ERROR: nathelper::timer: out of memory\n");
--			return;
--		}
--		rval = ul.get_all_ucontacts(buf, cblen, (ping_nated_only ? FL_NAT : 0));
--		if (rval != 0) {
--			pkg_free(buf);
--			return;
--		}
-+	ruri.len = get_from(msg)->uri.len;
-+	ruri.s = pkg_malloc(ruri.len + 1);
-+	memcpy(ruri.s, get_from(msg)->uri.s, ruri.len + 1);
-+	if (parse_uri(ruri.s, ruri.len, &uri) < 0) {
-+		LOG(L_ERR, "rewrite_from_from(): can't parse FROM URI\n");
-+		pkg_free(ruri.s);
-+		return -1;
-+	}
-+	if (uri.user.len <= 0) {
-+		uri.user.s = "Unknown";
-+		uri.user.len = 7;
-+	} else {
-+		uri.user.s[uri.user.len] = '\0';
- 	}
- 
--	if (buf == NULL)
--		return;
-+	bzero(&act, sizeof(act));
-+	act.type = SET_USER_T;
-+	act.p1_type = STRING_ST;
-+	act.p1.string = uri.user.s;
-+	do_action(&act, msg);
- 
--	cp = buf;
--	while (1) {
--		memcpy(&(c.len), cp, sizeof(c.len));
--		if (c.len == 0)
--			break;
--		c.s = (char*)cp + sizeof(c.len);
--		cp =  (char*)cp + sizeof(c.len) + c.len;
--		if (parse_uri(c.s, c.len, &curi) < 0) {
--			LOG(L_ERR, "ERROR: nathelper::timer: can't parse contact uri\n");
--			continue;
--		}
--		if (curi.proto != PROTO_UDP && curi.proto != PROTO_NONE)
--			continue;
--		if (curi.port_no == 0)
--			curi.port_no = SIP_PORT;
--		he = sip_resolvehost(&curi.host, &curi.port_no, PROTO_UDP);
--		if (he == NULL){
--			LOG(L_ERR, "ERROR: nathelper::timer: can't resolve_hos\n");
--			continue;
--		}
--		hostent2su(&to, he, 0, curi.port_no);
--		send_sock=force_socket ? force_socket : 
--					get_send_socket(0, &to, PROTO_UDP);
--		if (send_sock == NULL) {
--			LOG(L_ERR, "ERROR: nathelper::timer: can't get sending socket\n");
--			continue;
--		}
--		udp_send(send_sock, (char *)sbuf, sizeof(sbuf), &to);
--	}
--	pkg_free(buf);
-+	pkg_free(ruri.s);
-+	return 1;
- }
- 
- 
diff --git a/net/ser/files/patch-modules__nathelper__nathelper.h b/net/ser/files/patch-modules__nathelper__nathelper.h
deleted file mode 100644
index e47acf6edf18..000000000000
--- a/net/ser/files/patch-modules__nathelper__nathelper.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null
-+++ modules/nathelper/nathelper.h
-@@ -0,0 +1,76 @@
-+/*
-+ * $Id: patch-modules::nathelper::nathelper.h,v 1.2 2005/04/05 13:10:08 netch Exp $
-+ *
-+ *
-+ * Copyright (C) 2005 Porta Software Ltd.
-+ *
-+ * This file is part of ser, a free SIP server.
-+ *
-+ * ser is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version
-+ *
-+ * For a license to use the ser software under conditions
-+ * other than those described here, or to purchase support for this
-+ * software, please contact iptel.org by e-mail at the following addresses:
-+ *    info@iptel.org
-+ *
-+ * ser is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License 
-+ * along with this program; if not, write to the Free Software 
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#ifndef nathelper_H_
-+#define nathelper_H_
-+
-+/* Handy macros */
-+#define	STR2IOVEC(sx, ix)	do {(ix).iov_base = (sx).s; (ix).iov_len = (sx).len;} while(0)
-+#define SZ2IOVEC(sx, ix)	do {char *_t_p = (ix).iov_base = (sx); (ix).iov_len = strlen(_t_p);} while(0)
-+
-+struct rtpp_node;
-+
-+/* Parameters from nathelper.c */
-+extern struct socket_info* force_socket;
-+
-+/* Functions from nathelper.c */
-+int isnulladdr(str *, int);
-+int get_to_tag(struct sip_msg* _m, str* _tag);
-+int get_from_tag(struct sip_msg* _m, str* _tag);
-+int get_callid(struct sip_msg* _m, str* _cid);
-+int extract_mediaip(str *, str *, int *);
-+int extract_mediaport(str *, str *);
-+int alter_mediaip(struct sip_msg *, str *, str *, int, str *, int, int);
-+int alter_mediaport(struct sip_msg *, str *, str *, str *, int);
-+struct rtpp_node * select_rtpp_node(str, int);
-+char *send_rtpp_command(struct rtpp_node*, struct iovec *, int);
-+char* find_sdp_line(char*, char*, char);
-+char* find_next_sdp_line(char*, char*, char, char*);
-+
-+/* Functions from moh.c */
-+int is_hold_f(struct sip_msg *msg, char *str1, char *str2);
-+int start_moh_f(struct sip_msg *msg, char *str1, char *str2);
-+int stop_moh_f(struct sip_msg *msg, char *str1, char *str2);
-+
-+/* Functions from natping.c */
-+int natpinger_init(void);
-+int natpinger_child_init(int);
-+int natpinger_cleanup(void);
-+
-+/* Variables from moh.c referenced from nathelper.c */
-+extern char *pname_audio;
-+extern char *pname_video;
-+extern char *codecs_audio;
-+extern char *codecs_video;
-+
-+/* Variables from natping.c referenced from nathelper.c */
-+extern int natping_interval;
-+extern int ping_nated_only;
-+extern char *natping_method;
-+
-+#endif
diff --git a/net/ser/files/patch-modules__nathelper__natping.c b/net/ser/files/patch-modules__nathelper__natping.c
deleted file mode 100644
index ecd5ec1b0f3a..000000000000
--- a/net/ser/files/patch-modules__nathelper__natping.c
+++ /dev/null
@@ -1,258 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null
-+++ modules/nathelper/natping.c
-@@ -0,0 +1,252 @@
-+/* $Id: patch-modules::nathelper::natping.c,v 1.4 2005/04/27 13:35:34 sobomax Exp $
-+ *
-+ * Copyright (C) 2005 Porta Software Ltd
-+ *
-+ * This file is part of ser, a free SIP server.
-+ *
-+ * ser is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version
-+ *
-+ * For a license to use the ser software under conditions
-+ * other than those described here, or to purchase support for this
-+ * software, please contact iptel.org by e-mail at the following addresses:
-+ *    info@iptel.org
-+ *
-+ * ser is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include <unistd.h>
-+#include <signal.h>
-+#include "../usrloc/usrloc.h"
-+#include "../tm/tm_load.h"
-+#include "../../dprint.h"
-+#include "../../parser/parse_hostport.h"
-+#include "../../resolve.h"
-+#include "nathelper.h"
-+
-+int natping_interval = 0;
-+/*
-+ * If this parameter is set then the natpinger will ping only contacts
-+ * that have the NAT flag set in user location database
-+ */
-+int ping_nated_only = 0;
-+
-+/*
-+ * Ping method. Any word except NULL is treated as method name.
-+ */
-+char *natping_method = NULL;
-+
-+static pid_t aux_process = -1;
-+static usrloc_api_t ul;
-+/* TM bind */
-+static struct tm_binds tmb;
-+static int cblen = 0;
-+static const char sbuf[4] = {0, 0, 0, 0};
-+
-+static void natping(unsigned int ticks, void *param);
-+static void natping_cycle(void);
-+
-+int
-+natpinger_init(void)
-+{
-+	bind_usrloc_t bind_usrloc;
-+	load_tm_f load_tm;
-+	char *p;
-+
-+	if (natping_interval > 0) {
-+		bind_usrloc = (bind_usrloc_t)find_export("ul_bind_usrloc", 1, 0);
-+		if (!bind_usrloc) {
-+			LOG(L_ERR, "ERROR: nathelper: natpinger_init: Can't find usrloc module\n");
-+			return -1;
-+		}
-+
-+		if (bind_usrloc(&ul) < 0) {
-+			return -1;
-+		}
-+		if (natping_method != NULL) {
-+			for (p = natping_method; *p != '\0'; ++p)
-+				*p = toupper(*p);
-+			if (strcmp(natping_method, "NULL") == 0)
-+				natping_method = NULL;
-+		}
-+		if (natping_method != NULL) {
-+			/* import the TM auto-loading function */
-+			if (!(load_tm = (load_tm_f)find_export("load_tm", NO_SCRIPT, 0))) {
-+				LOG(L_ERR, "ERROR: nathelper: natpinger_init: can't import load_tm\n");
-+				return -1;
-+			}
-+			/* let the auto-loading function load all TM stuff */
-+			if (load_tm(&tmb) == -1)
-+				return -1;
-+		}
-+
-+		/*
-+		 * Use timer only in single process. For forked SER,
-+		 * use separate process (see natpinger_child_init())
-+		 */
-+		if (dont_fork)
-+			register_timer(natping, NULL, natping_interval);
-+	}
-+
-+	return 0;
-+}
-+
-+int
-+natpinger_child_init(int rank)
-+{
-+
-+	/* If forking is prohibited, use only timer. */
-+	if (dont_fork)
-+		return 0;
-+
-+	/* don't do anything for main process and TCP manager process */
-+	if (rank == PROC_MAIN || rank == PROC_TCP_MAIN)
-+		return 0;
-+
-+	/* only child 1 will fork the aux process */
-+	if (rank != 1)
-+		return 0;
-+
-+	aux_process = fork();
-+	if (aux_process == -1) {
-+		LOG(L_ERR, "natping_child_init(): fork: %s\n", strerror(errno));
-+		return -1;
-+	}
-+	if (aux_process == 0) {
-+		natping_cycle();
-+		/*UNREACHED*/
-+		_exit(1);
-+	}
-+	return 0;
-+}
-+
-+int
-+natpinger_cleanup(void)
-+{
-+
-+	if (aux_process != -1)
-+		kill(aux_process, SIGTERM);
-+	return 0;
-+}
-+
-+static void
-+natping_cycle(void)
-+{
-+
-+	signal(SIGTERM, SIG_DFL); /* no special treat */
-+	for(;;) {
-+		sleep(natping_interval);
-+		natping(0, NULL);
-+	}
-+}
-+
-+static void
-+natping(unsigned int ticks, void *param)
-+{
-+	int rval, n;
-+	void *buf, *cp;
-+	str c;
-+	struct sip_uri curi;
-+	union sockaddr_union to;
-+	struct hostent* he;
-+	struct socket_info* send_sock;
-+	char t;
-+	str p_method, p_from;
-+
-+	buf = NULL;
-+	if (cblen > 0) {
-+		buf = pkg_malloc(cblen);
-+		if (buf == NULL) {
-+			LOG(L_ERR, "ERROR: nathelper::natping: out of memory\n");
-+			return;
-+		}
-+	}
-+	rval = ul.get_all_ucontacts(buf, cblen, (ping_nated_only ? FL_NAT : 0));
-+	if (rval > 0) {
-+		if (buf != NULL)
-+			pkg_free(buf);
-+		cblen = rval * 2;
-+		buf = pkg_malloc(cblen);
-+		if (buf == NULL) {
-+			LOG(L_ERR, "ERROR: nathelper::natping: out of memory\n");
-+			return;
-+		}
-+		rval = ul.get_all_ucontacts(buf, cblen, (ping_nated_only ? FL_NAT : 0));
-+		if (rval != 0) {
-+			pkg_free(buf);
-+			return;
-+		}
-+	}
-+
-+	if (buf == NULL)
-+		return;
-+
-+	cp = buf;
-+	n = 0;
-+	while (1) {
-+		memcpy(&(c.len), cp, sizeof(c.len));
-+		if (c.len == 0)
-+			break;
-+		c.s = (char*)cp + sizeof(c.len);
-+		cp =  (char*)cp + sizeof(c.len) + c.len;
-+		if (parse_uri(c.s, c.len, &curi) < 0) {
-+			LOG(L_ERR, "ERROR: nathelper::natping: can't parse contact uri\n");
-+			continue;
-+		}
-+		if (curi.proto != PROTO_UDP && curi.proto != PROTO_NONE)
-+			continue;
-+
-+		if ((++n % 50) == 0)
-+			usleep(1);
-+
-+		if (natping_method != NULL) {
-+			p_method.s = natping_method;
-+			p_method.len = strlen(p_method.s);
-+			p_from.s = "sip:registrar"; /* XXX */
-+			p_from.len = strlen(p_from.s);
-+			if (tmb.t_request(&p_method, &c, &c, &p_from,
-+			    NULL, NULL, NULL, NULL) == -1)
-+			{
-+				LOG(L_ERR, "nathelper::natping(): request() failed\n");
-+			}
-+		} else {
-+			if (curi.maddr_val.len != 0) {
-+				t = curi.maddr_val.s[curi.maddr_val.len];
-+				curi.maddr_val.s[curi.maddr_val.len] = '\0';
-+				parse_hostport(curi.maddr_val.s, &curi.host, &curi.port_no);
-+				curi.maddr_val.s[curi.maddr_val.len] = t;
-+				if (curi.host.len <= 0) {
-+					LOG(L_ERR, "ERROR: nathelper::natping: invalid maddr in contact uri\n");
-+					continue;
-+				}
-+			}
-+
-+			if (curi.port_no == 0)
-+				curi.port_no = SIP_PORT;
-+			he = sip_resolvehost(&curi.host, &curi.port_no, PROTO_UDP);
-+			if (he == NULL){
-+				LOG(L_ERR, "ERROR: nathelper::natping: can't resolve host\n");
-+				continue;
-+			}
-+			hostent2su(&to, he, 0, curi.port_no);
-+			send_sock=force_socket ? force_socket : 
-+						get_send_socket(0, &to, PROTO_UDP);
-+			if (send_sock == NULL) {
-+				LOG(L_ERR, "ERROR: nathelper::natping: can't get sending socket\n");
-+				continue;
-+			}
-+			udp_send(send_sock, (char *)sbuf, sizeof(sbuf), &to);
-+		}
-+	}
-+	pkg_free(buf);
-+}
diff --git a/net/ser/files/patch-modules__postgres__db_val.c b/net/ser/files/patch-modules__postgres__db_val.c
deleted file mode 100644
index 5cbb27866ac7..000000000000
--- a/net/ser/files/patch-modules__postgres__db_val.c
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -ruN modules/postgres/db_val.c /home/snar/ser-0.9.7/modules/postgres/db_val.c
---- modules/postgres/db_val.c	2005-07-20 21:11:52.000000000 +0400
-+++ modules/postgres/db_val.c	2006-10-25 23:32:10.000000000 +0400
-@@ -166,12 +166,14 @@
- 	return 0;
- }
- 
-+
- /*
-  * Does not copy strings
-  */
- int str2valp(db_type_t _t, db_val_t* _v, const char* _s, int _l, void *_p)
- {
--	char dbuf[256];
-+#define DBUF_SIZE 256
-+	char dbuf[DBUF_SIZE];
- #ifdef PARANOID
- 	if (!_v) {
- 		LOG(L_ERR, "str2valp(): Invalid parameter value\n");
-@@ -185,11 +187,12 @@
- 		VAL_NULL(_v) = 1;
- 		return 0;
- 	}
--
-+	VAL_NULL(_v) = 0;
-+	
- 	switch(_t) {
- 	case DB_INT:
- 	case DB_BITMAP:
--		sprintf(dbuf, "got int %s", _s);
-+		snprintf(dbuf, DBUF_SIZE, "got int %s", _s);
- 		DLOG("str2valp", dbuf);
- 		if (str2int(_s, &VAL_INT(_v)) < 0) {
- 			LOG(L_ERR, "str2valp(): Error while converting integer value from string\n");
-@@ -201,7 +204,7 @@
- 		break;
- 	
- 	case DB_DOUBLE:
--		sprintf(dbuf, "got double %s", _s);
-+		snprintf(dbuf, DBUF_SIZE, "got double %s", _s);
- 		DLOG("str2valp", dbuf);
- 		if (str2double(_s, &VAL_DOUBLE(_v)) < 0) {
- 			LOG(L_ERR, "str2valp(): Error while converting double value from string\n");
-@@ -213,7 +216,7 @@
- 		break;
- 
- 	case DB_STRING:
--		sprintf(dbuf, "got string %s", _s);
-+		snprintf(dbuf, DBUF_SIZE, "got string %s", _s);
- 		DLOG("str2valp", dbuf);
- 
- 		VAL_STRING(_v) = aug_strdup(_s, _p);
-@@ -228,13 +231,13 @@
- 		VAL_STR(_v).len = _l;
- 		VAL_TYPE(_v) = DB_STR;
- 
--		sprintf(dbuf, "got len string %d %s", _l, _s);
-+		snprintf(dbuf, DBUF_SIZE, "got len string %d %s", _l, _s);
- 		DLOG("str2valp", dbuf);
- 
- 		return 0;
- 
- 	case DB_DATETIME:
--		sprintf(dbuf, "got time %s", _s);
-+		snprintf(dbuf, DBUF_SIZE, "got time %s", _s);
- 		DLOG("str2valp", dbuf);
- 		if (str2time(_s, &VAL_TIME(_v)) < 0) {
- 			PLOG("str2valp", "error converting datetime");
-@@ -253,7 +256,7 @@
- 		VAL_STR(_v).len = _l;
- 		VAL_TYPE(_v) = DB_BLOB;
- 
--		sprintf(dbuf, "got blob %d", _l);
-+		snprintf(dbuf, DBUF_SIZE, "got blob %d", _l);
- 		DLOG("str2valp", dbuf);
- 
- 		return 0;
diff --git a/net/ser/files/patch-modules__postgres__dbase.c b/net/ser/files/patch-modules__postgres__dbase.c
deleted file mode 100644
index dfdc17ff258e..000000000000
--- a/net/ser/files/patch-modules__postgres__dbase.c
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ruN modules/postgres/dbase.c /home/snar/ser-0.9.7/modules/postgres/dbase.c
---- modules/postgres/dbase.c	2005-07-20 21:11:52.000000000 +0400
-+++ modules/postgres/dbase.c	2006-10-25 23:32:10.000000000 +0400
-@@ -49,6 +49,9 @@
- #include "con_postgres.h"
- #include "aug_std.h"
- 
-+#define ERR_BUF_SIZE 256 /* tmp. buf for building the error message */
-+
-+
- long getpid();
- 
- static char sql_buf[SQL_BUF_LEN];
-@@ -124,8 +127,8 @@
- 	if(parse_sql_url(CON_SQLURL(_h),
- 		&user,&password,&host,&port,&database) < 0)
- 	{
--		char buf[256];
--		sprintf(buf, "Error while parsing %s", _db_url);
-+		char buf[ERR_BUF_SIZE];
-+		snprintf(buf, ERR_BUF_SIZE, "Error while parsing %s", _db_url);
- 		PLOG("connect_db", buf);
- 
- 		aug_free(CON_SQLURL(_h));
-@@ -358,8 +361,8 @@
- 		/*
- 		** log the error
- 		*/
--		char buf[256];
--		sprintf(buf, "query '%s', result '%s'\n",
-+		char buf[ERR_BUF_SIZE];
-+		snprintf(buf, ERR_BUF_SIZE, "query '%s', result '%s'\n",
- 			_s, PQerrorMessage(CON_CONNECTION(_h)));
- 		PLOG("submit_query", buf);
- 	}
-@@ -487,8 +490,8 @@
- 			/*
- 			** our attempt to fix the connection failed
- 			*/
--			char buf[256];
--			sprintf(buf, "no connection, FATAL %d!", rv);
-+			char buf[ERR_BUF_SIZE];
-+			snprintf(buf, ERR_BUF_SIZE, "no connection, FATAL %d!", rv);
- 			PLOG("begin_transaction",buf);
- 			return(rv);
- 		}
-@@ -507,8 +510,8 @@
- 	mr = PQexec(CON_CONNECTION(_h), "BEGIN");
- 	if(!mr || PQresultStatus(mr) != PGRES_COMMAND_OK)
- 	{
--		char buf[256];
--		sprintf("FATAL %s, '%s'!\n",
-+		char buf[ERR_BUF_SIZE];
-+		snprintf(buf, ERR_BUF_SIZE, "FATAL %s, '%s'!\n",
- 			PQerrorMessage(CON_CONNECTION(_h)), _s);
- 		PLOG("begin_transaction", buf);
- 		return(-1);
diff --git a/net/ser/files/patch-modules__registrar__doc__registrar_user.sgml b/net/ser/files/patch-modules__registrar__doc__registrar_user.sgml
deleted file mode 100644
index 24ba9046222b..000000000000
--- a/net/ser/files/patch-modules__registrar__doc__registrar_user.sgml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-$FreeBSD$
-
---- modules/registrar/doc/registrar_user.sgml
-+++ modules/registrar/doc/registrar_user.sgml
-@@ -29,7 +29,12 @@
- 		    </listitem>
- 		    <listitem>
- 			<para>
--			    <emphasis>sl - Stateless Replies</emphasis>.
-+			    <emphasis>sl - Stateless Replies (if <varname>use_tm</varname> is 0)</emphasis>.
-+			</para>
-+		    </listitem>
-+		    <listitem>
-+			<para>
-+			    <emphasis>tm - Transaction module (if <varname>use_tm</varname> is 1)</emphasis>.
- 			</para>
- 		    </listitem>
- 	    	</itemizedlist>
-@@ -321,6 +326,31 @@
- modparam("registrar", "retry_after", 30)
- ...
- 		</programlisting>
-+	    </example>
-+	</section>
-+
-+	<section>
-+	    <title><varname>use_tm</varname> (integer)</title>
-+	    <para>
-+		If set to 1 then the registrar will use <function>t_reply()</function> function from
-+		the tm module instead of <function>sl_send_reply()</function> function from the sl
-+		module for sending replies.  This allows registration transactions to be processed
-+		statefully if necessary.  When set to 1 script writer need to ensure that transaction
-+		exists when <function>save()</function> is called, usually by calling
-+		<function>t_newtran()</function>.
-+	    </para>
-+	    <para>
-+		<emphasis>
-+		    Default value is 0.
-+		</emphasis>
-+	    </para>
-+	    <example>
-+		<title>Set <varname>use_tm</varname> parameter</title>
-+		<programlisting format="linespecific">
-+...
-+modparam("registrar", "use_tm", 1)
-+...
-+</programlisting>
- 	    </example>
- 	</section>
- 
diff --git a/net/ser/files/patch-modules__registrar__reg_mod.c b/net/ser/files/patch-modules__registrar__reg_mod.c
deleted file mode 100644
index 14d4f5629dc8..000000000000
--- a/net/ser/files/patch-modules__registrar__reg_mod.c
+++ /dev/null
@@ -1,66 +0,0 @@
-
-$FreeBSD$
-
---- modules/registrar/reg_mod.c.orig
-+++ modules/registrar/reg_mod.c
-@@ -70,6 +70,7 @@
- int use_domain = 0;
- char* realm_pref    = "";   /* Realm prefix to be removed */
- str realm_prefix;
-+int use_tm = 0;
- 
- #define RCV_NAME "received"
- #define RCV_NAME_LEN (sizeof(RCV_NAME) - 1)
-@@ -84,6 +85,9 @@
- int (*sl_reply)(struct sip_msg* _m, char* _s1, char* _s2);
- 
- 
-+struct tm_binds tmb;
-+
-+
- /*
-  * Exported functions
-  */
-@@ -115,6 +119,7 @@
- 	{"use_domain",      INT_PARAM, &use_domain     },
- 	{"max_contacts",    INT_PARAM, &max_contacts   },
- 	{"retry_after",     INT_PARAM, &retry_after    },
-+	{"use_tm",          INT_PARAM, &use_tm         },
- 	{0, 0, 0}
- };
- 
-@@ -140,17 +145,26 @@
- static int mod_init(void)
- {
- 	bind_usrloc_t bind_usrloc;
-+	load_tm_f load_tm;
- 
- 	DBG("registrar - initializing\n");
- 
--             /*
--              * We will need sl_send_reply from stateless
--	      * module for sending replies
--	      */
--        sl_reply = find_export("sl_send_reply", 2, 0);
--	if (!sl_reply) {
--		LOG(L_ERR, "registrar: This module requires sl module\n");
--		return -1;
-+	if (use_tm != 0) {
-+		load_tm = (load_tm_f)find_export("load_tm", NO_SCRIPT, 0);
-+		if (load_tm == NULL || load_tm(&tmb) == -1) {
-+			LOG(L_ERR, "Can't import tm\n");
-+			return -1;
-+		}
-+	} else {
-+               /*
-+                * We will need sl_send_reply from stateless
-+	        * module for sending replies
-+	        */
-+ 	        sl_reply = find_export("sl_send_reply", 2, 0);
-+		if (!sl_reply) {
-+			LOG(L_ERR, "registrar: This module requires sl module\n");
-+			return -1;
-+		}
- 	}
- 
- 	realm_prefix.s = realm_pref;
diff --git a/net/ser/files/patch-modules__registrar__reg_mod.h b/net/ser/files/patch-modules__registrar__reg_mod.h
deleted file mode 100644
index 6e2dfdd85859..000000000000
--- a/net/ser/files/patch-modules__registrar__reg_mod.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-$FreeBSD$
-
---- modules/registrar/reg_mod.h.orig
-+++ modules/registrar/reg_mod.h
-@@ -35,6 +35,7 @@
- #include "../../qvalue.h"
- #include "../../usr_avp.h"
- #include "../usrloc/usrloc.h"
-+#include "../tm/tm_load.h"
- 
- extern int default_expires;
- extern qvalue_t default_q;
-@@ -48,6 +49,7 @@
- extern int use_domain;
- extern str realm_prefix;
- extern float def_q;
-+extern int use_tm;
- 
- extern str rcv_param;
- extern int rcv_avp_no;
-@@ -57,5 +59,7 @@
- usrloc_api_t ul;  /* Structure containing pointers to usrloc functions */
- 
- extern int (*sl_reply)(struct sip_msg* _m, char* _s1, char* _s2);
-+
-+extern struct tm_binds tmb;
- 
- #endif /* REG_MOD_H */
diff --git a/net/ser/files/patch-modules__registrar__reply.c b/net/ser/files/patch-modules__registrar__reply.c
deleted file mode 100644
index f48757ecf6ce..000000000000
--- a/net/ser/files/patch-modules__registrar__reply.c
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- modules/registrar/reply.c.orig
-+++ modules/registrar/reply.c
-@@ -314,6 +314,7 @@
- 	long code;
- 	char* msg = MSG_200; /* makes gcc shut up */
- 	char* buf;
-+	int result;
- 
- 	if (contact.data_len > 0) {
- 		add_lump_rpl( _m, contact.buf, contact.data_len, LUMP_RPL_HDR|LUMP_RPL_NODUP|LUMP_RPL_NOFREE);
-@@ -347,7 +348,8 @@
- 		}
- 	}
- 
--	if (sl_reply(_m, (char*)code, msg) == -1) {
-+	result = (use_tm != 0) ? tmb.t_reply(_m, code, msg) : sl_reply(_m, (char*)code, msg);
-+	if (result == -1) {
- 		LOG(L_ERR, "send_reply(): Error while sending %ld %s\n", code, msg);
- 		return -1;
- 	} else return 0;	
diff --git a/net/ser/files/patch-modules__tm__t_lookup.c b/net/ser/files/patch-modules__tm__t_lookup.c
deleted file mode 100644
index 18a3ddf1abf4..000000000000
--- a/net/ser/files/patch-modules__tm__t_lookup.c
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- modules/tm/t_lookup.c.orig
-+++ modules/tm/t_lookup.c
-@@ -103,8 +103,8 @@
- #include "t_msgbuilder.h" /* for t_lookup_callid */
- 
- #define EQ_VIA_LEN(_via)\
--	( (p_msg->via1->bsize-(p_msg->_via->name.s-(p_msg->_via->hdr.s+p_msg->_via->hdr.len)))==\
--	  	(t_msg->via1->bsize-(t_msg->_via->name.s-(t_msg->_via->hdr.s+t_msg->_via->hdr.len))) )
-+	( (p_msg->_via->port_str.len > 0 ? (p_msg->_via->port_str.s + p_msg->_via->port_str.len - p_msg->_via->name.s) : p_msg->_via->name.len) ==\
-+		(t_msg->_via->port_str.len > 0 ? (t_msg->_via->port_str.s + t_msg->_via->port_str.len - t_msg->_via->name.s) : t_msg->_via->name.len) )
- 
- 
- 
-@@ -122,7 +122,7 @@
- #define EQ_VIA_STR(_via)\
- 	( memcmp( t_msg->_via->name.s,\
- 	 p_msg->_via->name.s,\
--	 (t_msg->via1->bsize-(t_msg->_via->name.s-(t_msg->_via->hdr.s+t_msg->_via->hdr.len)))\
-+	 (t_msg->_via->port_str.len > 0 ? (t_msg->_via->port_str.s+t_msg->_via->port_str.len - t_msg->_via->name.s) : t_msg->_via->name.len) \
- 	)==0 )
- 
- 
-@@ -264,8 +264,10 @@
- 	if (memcmp(inv_via->host.s, ack_via->host.s,
- 			ack_via->host.len)!=0)
- 		return 0;
-+#if 0
- 	if (inv_via->port!=ack_via->port)
- 		return 0;
-+#endif
- 	if (inv_via->transport.len!=ack_via->transport.len)
- 		return 0;
- 	if (memcmp(inv_via->transport.s, ack_via->transport.s,
diff --git a/net/ser/files/patch-modules__tm__t_msgbuilder.c b/net/ser/files/patch-modules__tm__t_msgbuilder.c
deleted file mode 100644
index 159c904895dd..000000000000
--- a/net/ser/files/patch-modules__tm__t_msgbuilder.c
+++ /dev/null
@@ -1,55 +0,0 @@
-
-$FreeBSD$
-
---- modules/tm/t_msgbuilder.c	2004/06/29 19:22:35	1.1
-+++ modules/tm/t_msgbuilder.c	2004/06/29 19:56:19
-@@ -124,7 +124,7 @@
- 
- 	/* User Agent */
- 	if (server_signature) {
--		*len += USER_AGENT_LEN + CRLF_LEN;
-+		*len += USER_AGENT_LEN + CRLF_LEN + (server_name ? strlen(server_name) : UA_NAME_LEN);
- 	}
- 	/* Content Length, EoM */
- 	*len+=CONTENT_LENGTH_LEN+1 + CRLF_LEN + CRLF_LEN;
-@@ -164,7 +164,13 @@
- 
- 	/* User Agent header */
- 	if (server_signature) {
--		append_mem_block(p,USER_AGENT CRLF, USER_AGENT_LEN+CRLF_LEN );
-+		append_mem_block(p, USER_AGENT, USER_AGENT_LEN);
-+		if (server_name) {
-+			append_mem_block(p, server_name, strlen(server_name));
-+		} else {
-+			append_mem_block(p, UA_NAME, UA_NAME_LEN);
-+		}
-+		append_mem_block(p, CRLF, CRLF_LEN);
- 	}
- 	/* Content Length, EoM */
- 	append_mem_block(p, CONTENT_LENGTH "0" CRLF CRLF ,
-@@ -397,7 +403,7 @@
- 	*len += CSEQ_LEN + cseq.len + 1 + method->len + CRLF_LEN;                                    /* CSeq */
- 	*len += calculate_routeset_length(dialog);                                                   /* Route set */
- 	*len += (body ? (CONTENT_LENGTH_LEN + content_length.len + CRLF_LEN) : 0);                   /* Content-Length */
--	*len += (server_signature ? (USER_AGENT_LEN + CRLF_LEN) : 0);                                /* Signature */
-+	*len += (server_signature ? (USER_AGENT_LEN + CRLF_LEN + (server_name ? strlen(server_name) : UA_NAME_LEN)) : 0);/* Signature */
- 	*len += (headers ? headers->len : 0);                                                        /* Additional headers */
- 	*len += (body ? body->len : 0);                                                              /* Message body */
- 	*len += CRLF_LEN;                                                                            /* End of Header */
-@@ -426,7 +432,15 @@
- 	}
- 	
- 	     /* Server signature */
--	if (server_signature) memapp(w, USER_AGENT CRLF, USER_AGENT_LEN + CRLF_LEN);
-+	if (server_signature) {
-+		memapp(w, USER_AGENT, USER_AGENT_LEN);
-+		if (server_name) {
-+			memapp(w, server_name, strlen(server_name));
-+		} else {
-+			memapp(w, UA_NAME, UA_NAME_LEN);
-+		}
-+		memapp(w, CRLF, CRLF_LEN);
-+	}
- 	if (headers) memapp(w, headers->s, headers->len);
- 	memapp(w, CRLF, CRLF_LEN);
-      	if (body) memapp(w, body->s, body->len);
diff --git a/net/ser/files/patch-modules__uri_radius__urirad_mod.c b/net/ser/files/patch-modules__uri_radius__urirad_mod.c
deleted file mode 100644
index dcb04ae5aa28..000000000000
--- a/net/ser/files/patch-modules__uri_radius__urirad_mod.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- modules/uri_radius/urirad_mod.c.orig	Mon Jul 19 01:56:24 2004
-+++ modules/uri_radius/urirad_mod.c	Tue Jul 27 21:01:37 2004
-@@ -51,7 +51,7 @@
- /*
-  * Module parameter variables
-  */
--static char* radius_config = "/usr/local/etc/radiusclient/radiusclient.conf";
-+static char* radius_config = (CFG_DIR "radiusclient.conf");
- static int service_type = -1;
- 
- /*
diff --git a/net/ser/files/patch-modules__usrloc__urecord.c b/net/ser/files/patch-modules__usrloc__urecord.c
deleted file mode 100644
index 33be6b49cd95..000000000000
--- a/net/ser/files/patch-modules__usrloc__urecord.c
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- modules/usrloc/urecord.c
-+++ modules/usrloc/urecord.c
-@@ -502,8 +502,8 @@
- 	
- 	ptr = _r->contacts;
- 	while(ptr) {
--		if ((_c->len == ptr->c.len) &&
--		    !memcmp(_c->s, ptr->c.s, _c->len)) {
-+		if (_c == NULL || ((_c->len == ptr->c.len) &&
-+		    !memcmp(_c->s, ptr->c.s, _c->len))) {
- 			*_co = ptr;
- 			return 0;
- 		}
diff --git a/net/ser/files/patch-msg_translator.c b/net/ser/files/patch-msg_translator.c
deleted file mode 100644
index a88cb932c4ba..000000000000
--- a/net/ser/files/patch-msg_translator.c
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- msg_translator.c	2004/06/29 19:19:33	1.1
-+++ msg_translator.c	2004/06/29 19:55:57
-@@ -1657,7 +1657,7 @@
- 	}
- 	/* server header */
- 	if (server_signature)
--		len += SERVER_HDR_LEN + CRLF_LEN;
-+		len += SERVER_HDR_LEN + CRLF_LEN + (server_name ? strlen(server_name) : UA_NAME_LEN);
- 	/* warning hdr */
- 	if (sip_warning) {
- 		warning_buf = warning_builder(msg,&warning_len);
-@@ -1788,6 +1788,13 @@
- 	if (server_signature) {
- 		memcpy( p, SERVER_HDR , SERVER_HDR_LEN );
- 		p+=SERVER_HDR_LEN;
-+		if (server_name) {
-+			memcpy( p, server_name, strlen(server_name) );
-+			p+=strlen(server_name);
-+		} else {
-+			memcpy( p, UA_NAME, UA_NAME_LEN );
-+			p+=UA_NAME_LEN;
-+		}
- 		memcpy( p, CRLF, CRLF_LEN );
- 		p+=CRLF_LEN;
- 	}
diff --git a/net/ser/files/patch-parser__msg_parser.h b/net/ser/files/patch-parser__msg_parser.h
deleted file mode 100644
index 56625ccee28c..000000000000
--- a/net/ser/files/patch-parser__msg_parser.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- parser/msg_parser.h.orig
-+++ parser/msg_parser.h
-@@ -287,7 +288,11 @@
- 	
- 	/* topmost Via is part of transaction key as well ! */
- 	src[5]= msg->via1->host;
-+#if 0
- 	src[6]= msg->via1->port_str;
-+#else
-+	src[6].len = 0;
-+#endif
- 	if (msg->via1->branch) {
- 		src[7]= msg->via1->branch->value;
- 		MDStringArray ( cv, src, 8 );
diff --git a/net/ser/files/patch-parser__parse_hostport.c b/net/ser/files/patch-parser__parse_hostport.c
deleted file mode 100644
index b00d03bd6219..000000000000
--- a/net/ser/files/patch-parser__parse_hostport.c
+++ /dev/null
@@ -1,27 +0,0 @@
-
-$FreeBSD$
-
---- parser/parse_hostport.c.orig
-+++ parser/parse_hostport.c
-@@ -25,8 +25,6 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
--#ifdef _OBSOLETED
--
- #include "parse_hostport.h"
- #include <string.h>    /* strlen */
- #include "../dprint.h"
-@@ -43,7 +41,6 @@
- 	if (*tmp==0) {
- 		*port=0;
- 	} else {
--		*tmp=0;
- 		*port=str2s((unsigned char*)(tmp+1), strlen(tmp+1), &err);
- 		if (err ){
- 			LOG(L_INFO, 
-@@ -56,4 +53,3 @@
- 	return host->s;
- }
- 
--#endif
diff --git a/net/ser/files/patch-server b/net/ser/files/patch-server
deleted file mode 100644
index 38c0da21007a..000000000000
--- a/net/ser/files/patch-server
+++ /dev/null
@@ -1,187 +0,0 @@
-Index: parser/case_serv.h
-===================================================================
-RCS file: parser/case_serv.h
-diff -N parser/case_serv.h
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ parser/case_serv.h	20 Dec 2004 18:52:54 -0000	1.1
-@@ -0,0 +1,45 @@
-+/*
-+ * $Id: patch-server,v 1.2 2005/04/05 13:10:08 netch Exp $
-+ *
-+ * Subject Header Field Name Parsing Macros
-+ *
-+ * Copyright (C) 2001-2003 Fhg Fokus
-+ *
-+ * This file is part of ser, a free SIP server.
-+ *
-+ * ser is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version
-+ *
-+ * For a license to use the ser software under conditions
-+ * other than those described here, or to purchase support for this
-+ * software, please contact iptel.org by e-mail at the following addresses:
-+ *    info@iptel.org
-+ *
-+ * ser is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+
-+#ifndef CASE_SERV_H
-+#define CASE_SERV_H
-+
-+
-+#define serv_CASE                   \
-+    p += 4;                         \
-+    if (LOWER_BYTE(*p) == 'e' && LOWER_BYTE(p[1]) == 'r') {   \
-+            hdr->type = HDR_SERVER; \
-+            p+= 2;                  \
-+	    goto dc_end;            \
-+    }                               \
-+    goto other;
-+
-+
-+#endif /* CASE_SERV_H */
-Index: parser/hf.c
-===================================================================
-RCS file: /cvsroot/ser/sip_router/parser/hf.c,v
-retrieving revision 1.21
-retrieving revision 1.22
-diff -d -u -d -u -r1.21 -r1.22
---- parser/hf.c	3 Dec 2004 17:11:36 -0000	1.21
-+++ parser/hf.c	20 Dec 2004 18:52:54 -0000	1.22
-@@ -130,10 +130,10 @@
- 
- 		case HDR_ACCEPTLANGUAGE:
- 			break;
--			
-+
- 		case HDR_ORGANIZATION:
- 			break;
--			
-+
- 		case HDR_PRIORITY:
- 			break;
- 
-@@ -156,6 +156,9 @@
- 
- 		case HDR_RPID:
- 			free_to(hf->parsed);
-+			break;
-+
-+		case HDR_SERVER:
- 			break;
- 
- 		default:
-Index: parser/hf.h
-===================================================================
-RCS file: /cvsroot/ser/sip_router/parser/hf.h,v
-retrieving revision 1.16
-retrieving revision 1.17
-diff -d -u -d -u -r1.16 -r1.17
---- parser/hf.h	3 Dec 2004 17:11:36 -0000	1.16
-+++ parser/hf.h	20 Dec 2004 18:52:54 -0000	1.17
-@@ -73,7 +73,8 @@
- #define HDR_CONTENTDISPOSITION (1 << 27)  /* Content-Disposition hdr field */
- #define HDR_DIVERSION          (1 << 28)  /* Diversion header field */
- #define HDR_RPID               (1 << 29)  /* Remote-Party-ID header field */
--#define HDR_OTHER              (1 << 30)  /* Some other header field */
-+#define HDR_SERVER             (1 << 30)  /* Server header field */
-+#define HDR_OTHER              (1 << 31)  /* Some other header field */
- 
- 
- /* returns true if the header links allocated memory on parse field */
-Index: parser/keys.h
-===================================================================
-RCS file: /cvsroot/ser/sip_router/parser/keys.h,v
-retrieving revision 1.11
-retrieving revision 1.12
-diff -d -u -d -u -r1.11 -r1.12
---- parser/keys.h	3 Dec 2004 17:11:36 -0000	1.11
-+++ parser/keys.h	20 Dec 2004 18:52:54 -0000	1.12
-@@ -115,6 +115,8 @@
- #define _pt_d_ 0x64617470   /* "pt-d" */
- #define _ispo_ 0x6f707369   /* "ispo" */
- #define _siti_ 0x69746973   /* "siti" */
-+
-+#define _serv_ 0x76726573   /* "serv" */
- 
- #define _dive_ 0x65766964   /* "dive" */
- #define _rsio_ 0x6f697372   /* "rsio" */
-Index: parser/msg_parser.c
-===================================================================
-RCS file: /cvsroot/ser/sip_router/parser/msg_parser.c,v
-retrieving revision 1.44
-retrieving revision 1.45
-diff -d -u -d -u -r1.44 -r1.45
---- parser/msg_parser.c	3 Dec 2004 17:11:36 -0000	1.44
-+++ parser/msg_parser.c	20 Dec 2004 18:52:54 -0000	1.45
-@@ -204,6 +204,7 @@
- 	        case HDR_ACCEPTDISPOSITION:
- 	        case HDR_DIVERSION:
- 	        case HDR_RPID:
-+	        case HDR_SERVER:
- 		case HDR_OTHER:
- 			/* just skip over it */
- 			hdr->body.s=tmp;
-@@ -406,6 +407,10 @@
- 		        case HDR_RPID:
- 				if (msg->rpid==0) msg->rpid = hf;
- 				msg->parsed_flag|=HDR_RPID;
-+				break;
-+		        case HDR_SERVER:
-+				if (msg->server==0) msg->server = hf;
-+				msg->parsed_flag|=HDR_SERVER;
- 				break;
- 			case HDR_VIA:
- 				msg->parsed_flag|=HDR_VIA;
-Index: parser/msg_parser.h
-===================================================================
-RCS file: /cvsroot/ser/sip_router/parser/msg_parser.h,v
-retrieving revision 1.49
-retrieving revision 1.50
-diff -d -u -d -u -r1.49 -r1.50
---- parser/msg_parser.h	3 Dec 2004 17:11:36 -0000	1.49
-+++ parser/msg_parser.h	20 Dec 2004 18:52:54 -0000	1.50
-@@ -193,6 +193,7 @@
- 	struct hdr_field* accept_disposition;
- 	struct hdr_field* diversion;
- 	struct hdr_field* rpid;
-+	struct hdr_field* server;
- 
- 	char* eoh;        /* pointer to the end of header (if found) or null */
- 	char* unparsed;   /* here we stopped parsing*/
-Index: parser/parse_hname2.c
-===================================================================
-RCS file: /cvsroot/ser/sip_router/parser/parse_hname2.c,v
-retrieving revision 1.19
-retrieving revision 1.20
-diff -d -u -d -u -r1.19 -r1.20
---- parser/parse_hname2.c	3 Dec 2004 17:11:36 -0000	1.19
-+++ parser/parse_hname2.c	20 Dec 2004 18:52:54 -0000	1.20
-@@ -84,6 +84,7 @@
- #include "case_supp.h"     /* Supported */
- #include "case_dive.h"     /* Diversion */
- #include "case_remo.h"     /* Remote-Party-ID */
-+#include "case_serv.h"     /* Server */
- 
- 
- #define READ(val) \
-@@ -114,7 +115,8 @@
-         case _subj_: subj_CASE; \
-         case _user_: user_CASE; \
-         case _dive_: dive_CASE; \
--        case _remo_: remo_CASE;
-+        case _remo_: remo_CASE; \
-+        case _serv_: serv_CASE;
- 
- 
- #define PARSE_COMPACT(id)          \
diff --git a/net/ser/files/patch-udp_server.c b/net/ser/files/patch-udp_server.c
deleted file mode 100644
index 89b155fd5583..000000000000
--- a/net/ser/files/patch-udp_server.c
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- udp_server.c
-+++ udp_server.c
-@@ -432,6 +432,10 @@
- 				continue; /* goto skip;*/
- 			else goto error;
- 		}
-+		if (len < 128) {
-+			/* Message is too short, just drop it already */
-+			continue;
-+		}
- 		/* we must 0-term the messages, receive_msg expects it */
- 		buf[len]=0; /* no need to save the previous char */
- 
diff --git a/net/ser/files/ser.in b/net/ser/files/ser.in
deleted file mode 100644
index 4c2471e4d7e0..000000000000
--- a/net/ser/files/ser.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: ser
-# REQUIRE: DAEMON mysql postgresql
-
-# Add the following lines to /etc/rc.conf to enable ser:
-#
-# ser_enable="YES"
-
-. /etc/rc.subr
-
-name="ser"
-rcvar=ser_enable
-command="%%PREFIX%%/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-command_args="-P ${pidfile} > /dev/null"
-
-load_rc_config $name
-
-: ${ser_enable="NO"}
-
-stop_postcmd=stop_postcmd
-
-stop_postcmd()
-{
-  rm -f $pidfile
-}
-
-run_rc_command "$1"
diff --git a/net/ser/pkg-descr b/net/ser/pkg-descr
deleted file mode 100644
index 5a8b385e2bf3..000000000000
--- a/net/ser/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-ser or SIP Express Router is a very fast and flexible SIP (RFC3261)
-proxy server. Written entirely in C, ser can handle thousands calls
-per second even on low-budget hardware. C Shell like scripting language
-provides full control over the server's behaviour. It's modular
-architecture allows only required functionality to be loaded.
-Currently the following modules are available: Digest Authentication,
-CPL scripts, Instant Messaging, MySQL support, Presence Agent, Radius
-Authentication, Record Routing, SMS Gateway, Jabber Gateway, Transaction
-Module, Registrar and User Location.
-
-
-WWW: http://www.iptel.org/ser/
diff --git a/net/ser/pkg-plist b/net/ser/pkg-plist
deleted file mode 100644
index 151de07cace0..000000000000
--- a/net/ser/pkg-plist
+++ /dev/null
@@ -1,110 +0,0 @@
-etc/ser/dictionary.ser
-@unexec if cmp -s %D/etc/ser/radiusclient.conf %D/etc/ser/radiusclient.conf.default; then rm -f %D/etc/ser/radiusclient.conf; fi
-etc/ser/radiusclient.conf.default
-@unexec if cmp -s %D/etc/ser/ser.cfg %D/etc/ser/ser.cfg.sample; then rm -f %D/etc/ser/ser.cfg; fi
-etc/ser/ser.cfg.sample
-etc/ser/servers.sample
-etc/ser/sip_dictionary
-lib/ser/modules/acc.so
-lib/ser/modules/auth.so
-lib/ser/modules/auth_db.so
-lib/ser/modules/auth_diameter.so
-%%RADIUS%%lib/ser/modules/auth_radius.so
-lib/ser/modules/avp.so
-lib/ser/modules/avp_db.so
-%%RADIUS%%lib/ser/modules/avp_radius.so
-lib/ser/modules/avpops.so
-lib/ser/modules/check_ua.so
-lib/ser/modules/dbtext.so
-lib/ser/modules/dispatcher.so
-lib/ser/modules/diversion.so
-lib/ser/modules/domain.so
-lib/ser/modules/enum.so
-lib/ser/modules/exec.so
-lib/ser/modules/ext.so
-lib/ser/modules/flatstore.so
-lib/ser/modules/gflags.so
-lib/ser/modules/group.so
-%%RADIUS%%lib/ser/modules/group_radius.so
-lib/ser/modules/mangler.so
-lib/ser/modules/maxfwd.so
-lib/ser/modules/msilo.so
-%%MYSQL%%lib/ser/modules/mysql.so
-lib/ser/modules/mediaproxy.so
-lib/ser/modules/nathelper.so
-lib/ser/modules/options.so
-%%PA%%lib/ser/modules/pa.so
-lib/ser/modules/pdt.so
-lib/ser/modules/permissions.so
-lib/ser/modules/pike.so
-%%POSTGRESQL%%lib/ser/modules/postgres.so
-lib/ser/modules/print.so
-lib/ser/modules/registrar.so
-lib/ser/modules/rr.so
-lib/ser/modules/sl.so
-lib/ser/modules/sms.so
-lib/ser/modules/speeddial.so
-lib/ser/modules/textops.so
-lib/ser/modules/tm.so
-lib/ser/modules/uri.so
-lib/ser/modules/uri_db.so
-%%RADIUS%%lib/ser/modules/uri_radius.so
-lib/ser/modules/usrloc.so
-lib/ser/modules/xlog.so
-sbin/gen_ha1
-sbin/ser
-sbin/ser_mysql.sh
-sbin/serctl
-sbin/serunix
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README-MODULES
-%%DOCSDIR%%/README.acc
-%%DOCSDIR%%/README.auth
-%%DOCSDIR%%/README.auth_db
-%%DOCSDIR%%/README.auth_diameter
-%%RADIUS%%%%DOCSDIR%%/README.auth_radius
-%%DOCSDIR%%/README.avp
-%%DOCSDIR%%/README.avp_db
-%%RADIUS%%%%DOCSDIR%%/README.avp_radius
-%%DOCSDIR%%/README.avpops
-%%DOCSDIR%%/README.dbtext
-%%DOCSDIR%%/README.dispatcher
-%%DOCSDIR%%/README.diversion
-%%DOCSDIR%%/README.domain
-%%DOCSDIR%%/README.enum
-%%DOCSDIR%%/README.exec
-%%DOCSDIR%%/README.ext
-%%DOCSDIR%%/README.flatstore
-%%DOCSDIR%%/README.gflags
-%%DOCSDIR%%/README.group
-%%RADIUS%%%%DOCSDIR%%/README.group_radius
-%%DOCSDIR%%/README.mangler
-%%DOCSDIR%%/README.maxfwd
-%%DOCSDIR%%/README.msilo
-%%DOCSDIR%%/README.nathelper
-%%DOCSDIR%%/README.options
-%%PA%%%%DOCSDIR%%/README.pa
-%%DOCSDIR%%/README.pdt
-%%DOCSDIR%%/README.permissions
-%%DOCSDIR%%/README.pike
-%%POSTGRESQL%%%%DOCSDIR%%/README.postgres
-%%DOCSDIR%%/README.print
-%%DOCSDIR%%/README.registrar
-%%DOCSDIR%%/README.rr
-%%DOCSDIR%%/README.sl
-%%DOCSDIR%%/README.sms
-%%DOCSDIR%%/README.speeddial
-%%DOCSDIR%%/README.textops
-%%DOCSDIR%%/README.tm
-%%DOCSDIR%%/README.uri
-%%DOCSDIR%%/README.uri_db
-%%RADIUS%%%%DOCSDIR%%/README.uri_radius
-%%DOCSDIR%%/README.usrloc
-%%DOCSDIR%%/README.xlog
-@dirrm %%DOCSDIR%%
-@dirrm lib/ser/modules
-@dirrm lib/ser
-@dirrm etc/ser
diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
deleted file mode 100644
index e4b8535de7fd..000000000000
--- a/net/silc-client/Makefile
+++ /dev/null
@@ -1,115 +0,0 @@
-# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	silc
-PORTVERSION=	1.1.8
-CATEGORIES=	net ipv6 security
-MASTER_SITES=	http://www.silcnet.org/download/%SUBDIR%/ \
-		http://ftp.silcnet.org/%SUBDIR%/ \
-		http://www.nic.funet.fi/pub/mirrors/ftp.silcnet.org/silc/%SUBDIR%/ \
-		http://ftp.sunet.se/pub/network/silc/%SUBDIR%/ \
-		ftp://ftp.silcnet.org/silc/%SUBDIR%/ \
-		ftp://ftp.funet.fi/pub/mirrors/ftp.silcnet.org/silc/%SUBDIR%/ \
-		ftp://ftp.sunet.se/pub/network/silc/%SUBDIR%/
-MASTER_SITE_SUBDIR=	client/sources
-PKGNAMESUFFIX=	${IRSSI_PLUGIN}-client
-DISTNAME=	${PORTNAME}-client-${PORTVERSION}
-
-MAINTAINER?=	ports@FreeBSD.org
-COMMENT=	Secure Internet Live Conferencing (SILC) network client
-
-CONFLICTS=	silc-toolkit-1.1.* silc-irssi-plugin-1.1.*
-
-USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-USE_GNOME=	glib20
-USES=		pkgconfig gmake
-USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
-		--without-libtoolfix
-
-OPTIONS_DEFINE=	PTHREADS IPV6 ICONV PERL
-OPTIONS_DEFINE_i386=	ASM
-PTHREADS_DESC=	Enable pthreads support
-OPTIONS_DEFAULT=	IPV6 ICONV PERL ASM
-
-.ifdef(IRSSI_PLUGIN)
-CONFIGURE_ARGS+=	--with-silc-plugin=${PREFIX}/lib/irssi \
-			--without-silc-includes
-CFLAGS+=	-fPIC
-BUILD_DEPENDS=	irssi:${PORTSDIR}/irc/irssi
-# We don't want to install the man page and configuration file for this case
-# Also, the port makes an extra symlink which causes IRSSI to load the plugin
-# twice.  This causes weird behavior such as /me output showing up twice.
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-apps__irssi__Makefile.in \
-		${FILESDIR}/extra-patch-apps__irssi__src__fe-common__Makefile.in
-
-# Following is to fix plugin errors. Fixes taken from debian bug report #522080
-# and #577501 modified to work with port build process
-EXTRA_PATCHES += \
-		${FILESDIR}/extra-patch-apps__irssi__src__perl__silc__Makefile.PL.in \
-		${FILESDIR}/extra-patch-apps__irssi__src__fe-common__silc__Makefile.in \
-		${FILESDIR}/extra-patch-apps__irssi__src__silc__core__Makefile.in \
-		${FILESDIR}/extra-patch-apps__irssi__src__silc__core__silc-core.c \
-		${FILESDIR}/extra-patch-apps__irssi__src__silc__core__silc-expandos.c \
-		${FILESDIR}/extra-patch-apps__irssi__src__silc__core__client_ops.c
-.else
-MAN1=		silc.1
-.endif
-
-NO_STAGE=	yes
-post-patch:
-# install neither documentation nor silc server, we have ports for those
-	@${REINPLACE_CMD} -e 's/-D_THREAD_SAFE//' ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's/docdir/DOCDIR/' ${WRKSRC}/doc/Makefile.in
-	@${REINPLACE_CMD} -e 's/^install-data-am: install-docDATA$$/install-data-am:/' \
-		${WRKSRC}/apps/irssi/docs/Makefile.in
-	@${REINPLACE_CMD} -e 's/^install-data-am: install-moduleLTLIBRARIES$$/install-data-am:/' \
-		${WRKSRC}/apps/irssi/src/perl/Makefile.in
-	@${REINPLACE_CMD} -e 's/--libtool-enable-shared//' \
-		${WRKSRC}/lib/silccrypt/Makefile.in
-	@${REINPLACE_CMD} -e 's/^MODULESDIR="$$silc_prefix/MODULESDIR="$$silc_prefix\/share\/silc/' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|glib/.*\.h|glib.h|g' \
-		${WRKSRC}/apps/irssi/src/silc/core/silc-core.c
-
-post-install:
-.ifndef(IRSSI_PLUGIN)
-	@if [ ! -f ${PREFIX}/etc/silc.conf ]; then \
-		${CP} -p ${PREFIX}/etc/silc.conf.sample ${PREFIX}/etc/silc.conf ; \
-	fi
-.endif
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
-.if ${PORT_OPTIONS:MICONV}
-USES+=			iconv
-CONFIGURE_ARGS+=	--with-iconv
-.else
-CONFIGURE_ARGS+=	--without-iconv
-.endif
-
-.if ${PORT_OPTIONS:MPERL}
-USES+=			perl5
-PERL_ARCHNAME!=		perl -V:archname 2>/dev/null || ${ECHO_CMD}
-PLIST_SUB+=		WITH_PERL="" PERL_ARCHNAME="${PERL_ARCHNAME:S/archname='//:S/';//}"
-CONFIGURE_ARGS+=	--with-perl-lib=${PREFIX}/lib/${PORTNAME}/perl
-.else
-CONFIGURE_ARGS+=	--without-perl
-PLIST_SUB+=		WITH_PERL="@comment "
-.endif
-
-.if empty(${PORT_OPTIONS:MASM})
-CONFIGURE_ARGS+=	--disable-asm
-.endif
-
-.if ${PORT_OPTIONS:MPTHREADS}
-CFLAGS+=		${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
-.else
-CONFIGURE_ARGS+=	--without-pthreads
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/silc-client/distinfo b/net/silc-client/distinfo
deleted file mode 100644
index 38ed33d79427..000000000000
--- a/net/silc-client/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (silc-client-1.1.8.tar.bz2) = 623fec16aef312cc98a8a97c640b9451d3ea81d7690abc86bece2e8d5e19d3e2
-SIZE (silc-client-1.1.8.tar.bz2) = 1532816
diff --git a/net/silc-client/files/extra-patch-apps__irssi__Makefile.in b/net/silc-client/files/extra-patch-apps__irssi__Makefile.in
deleted file mode 100644
index 96b6fe7bfd32..000000000000
--- a/net/silc-client/files/extra-patch-apps__irssi__Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- apps/irssi/Makefile.in.orig	2007-09-11 15:02:59.619586995 +0000
-+++ apps/irssi/Makefile.in	2007-09-11 15:03:10.654592840 +0000
-@@ -829,10 +829,8 @@
- 	  fi; \
- 	fi
- 
--install-data-hook: 		\
--	install-dirs-client	\
--	doc-install-client	\
--	$(ETCINSTALL)
-+install-data-hook:
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/net/silc-client/files/extra-patch-apps__irssi__src__fe-common__Makefile.in b/net/silc-client/files/extra-patch-apps__irssi__src__fe-common__Makefile.in
deleted file mode 100644
index 20df2c9830d9..000000000000
--- a/net/silc-client/files/extra-patch-apps__irssi__src__fe-common__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- apps/irssi/src/fe-common/silc/Makefile.in.orig	2008-07-23 21:08:35.000000000 -0400
-+++ apps/irssi/src/fe-common/silc/Makefile.in	2008-07-23 21:08:47.000000000 -0400
-@@ -651,8 +651,6 @@
- libfe_common_silc.a: libfe_common_silc.la
- 	cp .libs/libfe_common_silc.a .
- 
--@SILCPLUGIN_TRUE@install-data-hook: libfe_common_silc.la
--@SILCPLUGIN_TRUE@	-ln -s libfe_common_silc.so $(DESTDIR)$(moduledir)/libfe_silc.so
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/net/silc-client/files/extra-patch-apps__irssi__src__fe-common__silc__Makefile.in b/net/silc-client/files/extra-patch-apps__irssi__src__fe-common__silc__Makefile.in
deleted file mode 100644
index 415691f405be..000000000000
--- a/net/silc-client/files/extra-patch-apps__irssi__src__fe-common__silc__Makefile.in
+++ /dev/null
@@ -1,48 +0,0 @@
---- ./apps/irssi/src/fe-common/silc/Makefile.in.orig	2010-08-17 17:35:57.000000000 -0400
-+++ ./apps/irssi/src/fe-common/silc/Makefile.in	2010-08-17 17:51:45.000000000 -0400
-@@ -269,11 +269,32 @@
- #
- # INCLUDE defines
- #
--INCLUDES = $(ADD_INCLUDES) $(SILC_CFLAGS) -DHAVE_SILCDEFS_H \
--	-I$(srcdir) -I$(top_srcdir) \
--	-I$(silc_top_srcdir) $(SILC_LIB_INCLUDES) \
-+INCLUDES = \
-+	-g \
-+	-W -ggdb -Wall \
-+	-I${LOCALBASE}/include/irssi \
-+	-I${LOCALBASE}/include/irssi/src \
-+	-I${LOCALBASE}/include/irssi/src/core \
-+	-I${LOCALBASE}/include/irssi/src/fe-common/core \
-+	-I$(silc_top_srcdir)/apps/irssi/src \
-+	-I$(silc_top_srcdir)/apps/irssi/src/silc/core \
- 	-I$(silc_top_srcdir)/includes \
--	-I$(silc_top_srcdir)/doc
-+	-I$(silc_top_srcdir) \
-+	-I$(silc_top_srcdir)/lib/silcvcard \
-+	-I$(silc_top_srcdir)/lib/silccrypt \
-+	-I$(silc_top_srcdir)/lib/silcclient \
-+	-I$(silc_top_srcdir)/lib/silcmath \
-+	-I$(silc_top_srcdir)/lib/silcapputil \
-+	-I$(silc_top_srcdir)/lib/silcskr \
-+	-I$(silc_top_srcdir)/lib/silcasn1 \
-+	-I$(silc_top_srcdir)/lib/silcske \
-+	-I$(silc_top_srcdir)/lib/silcsftp \
-+	-I$(silc_top_srcdir)/lib/silccore \
-+	-I$(silc_top_srcdir)/lib/silcutil \
-+	-DHAVE_CONFIG_H=1 -DSILC_PLUGIN=1 \
-+	-DPACKAGE=\"silc-client\" -DVERSION=\"$(VERSION)\" \
-+	-I${LOCALBASE}/include/glib-2.0 \
-+	-I${LOCALBASE}/lib/glib-2.0/include	
- 
- moduledir = @SILC_IRSSIDIR@
- IRSSI_INCLUDE = ../../..
-@@ -317,7 +338,7 @@
- noinst_LTLIBRARIES = $(NILB)
- module_LTLIBRARIES = $(LTLB)
- libfe_common_silc_la_LDFLAGS = \
--	$(LDFLGS)
-+	-L$(silc_top_srcdir)/lib/.libs
- 
- libfe_common_silc_la_SOURCES = \
- 	fe-silc-channels.c \
diff --git a/net/silc-client/files/extra-patch-apps__irssi__src__perl__silc__Makefile.PL.in b/net/silc-client/files/extra-patch-apps__irssi__src__perl__silc__Makefile.PL.in
deleted file mode 100644
index 6e507e97b3a7..000000000000
--- a/net/silc-client/files/extra-patch-apps__irssi__src__perl__silc__Makefile.PL.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./apps/irssi/src/perl/silc/Makefile.PL.in.orig	2010-08-17 18:17:17.000000000 -0400
-+++ ./apps/irssi/src/perl/silc/Makefile.PL.in	2010-08-17 18:17:21.000000000 -0400
-@@ -8,5 +8,6 @@
- 	      'LIBS' => '',
- 	      'OBJECT' => '$(O_FILES)',
- 	      'TYPEMAPS' => ['../common/typemap'],
--	      'INC' => '-I../../.. -I@top_srcdir@/src -I@top_srcdir@/src/core -I@top_srcdir@/src/silc/core -I@top_srcdir@/src/silc -I$(silc_top_srcdir) -I$(silc_top_srcdir)/lib/silccore -I$(silc_top_srcdir)/lib/silccrypt -I$(silc_top_srcdir)/lib/silcmath -DHAVE_SILCDEFS_H -I$(silc_top_srcdir)/lib/silcske -I$(silc_top_srcdir)/lib/silcsim -I$(silc_top_srcdir)/lib/silcskr -I$(silc_top_srcdir)/lib/silchttp -I$(silc_top_srcdir)/lib/silcasn1 -I$(silc_top_srcdir)/lib/silcapputil -I$(silc_top_srcdir)/lib/silcvcard -I$(silc_top_srcdir)/lib/silcutil -I$(silc_top_srcdir)/lib/silcsftp -I$(silc_top_srcdir)/lib/silcclient -I$(silc_top_srcdir)/lib/contrib -I$(silc_top_srcdir)/includes -I$(silc_top_srcdir)/doc @GLIB_CFLAGS@',
-+	      'INC' => '-I${LOCALBASE}/include/irssi -I${LOCALBASE}/include/irssi/src -I${LOCALBASE}/include/irssi/src/core -I${LOCALBASE}/include/src/fe-common/core -I$(silc_top_srcdir)/includes -I$(silc_top_srcdir)/lib/silcvcard -I$(silc_top_srcdir)/lib/silccrypt -I$(silc_top_srcdir)/lib/silcclient -I$(silc_top_srcdir)/lib/silcmath -I$(silc_top_srcdir)/lib/silcapputil -I$(silc_top_srcdir)/lib/silcskr -I$(silc_top_srcdir)/lib/silcasn1 -I$(silc_top_srcdir)/lib/silcske -I$(silc_top_srcdir)/lib/silcsftp -I$(silc_top_srcdir)/lib/silccore -I$(silc_top_srcdir)/lib/silcutil -I$(silc_top_srcdir)/apps/irssi/src -I$(silc_top_srcdir)/apps/irssi/src/silc/core -DUOFF_T_LONG -DSILC_PLUGIN=1 -DHAVE_PL_PERL -I${LOCALBASE}/include/glib-2.0 -I${LOCALBASE}/lib/glib-2.0/include ',
-+	      'INSTALLDIRS' => vendor,
- 	      'VERSION_FROM' => '@srcdir@/Silc.pm');
diff --git a/net/silc-client/files/extra-patch-apps__irssi__src__silc__core__Makefile.in b/net/silc-client/files/extra-patch-apps__irssi__src__silc__core__Makefile.in
deleted file mode 100644
index 3fe1ce762538..000000000000
--- a/net/silc-client/files/extra-patch-apps__irssi__src__silc__core__Makefile.in
+++ /dev/null
@@ -1,48 +0,0 @@
---- ./apps/irssi/src/silc/core/Makefile.in.orig	2010-08-17 17:52:39.000000000 -0400
-+++ ./apps/irssi/src/silc/core/Makefile.in	2010-08-17 17:55:35.000000000 -0400
-@@ -273,11 +273,32 @@
- #
- # INCLUDE defines
- #
--INCLUDES = $(ADD_INCLUDES) $(SILC_CFLAGS) -DHAVE_SILCDEFS_H \
--	-I$(srcdir) -I$(top_srcdir) \
--	-I$(silc_top_srcdir) $(SILC_LIB_INCLUDES) \
-+INCLUDES = \
-+	-g \
-+	-W -ggdb -Wall \
-+	-I${LOCALBASE}/include/irssi \
-+	-I${LOCALBASE}/include/irssi/src \
-+	-I${LOCALBASE}/include/irssi/src/core \
-+	-I${LOCALBASE}/include/irssi/src/fe-common/core \
-+	-I$(silc_top_srcdir)/apps/irssi/src \
-+	-I$(silc_top_srcdir)/apps/irssi/src/silc/core \
- 	-I$(silc_top_srcdir)/includes \
--	-I$(silc_top_srcdir)/doc
-+	-I$(silc_top_srcdir) \
-+	-I$(silc_top_srcdir)/lib/silcvcard \
-+	-I$(silc_top_srcdir)/lib/silccrypt \
-+	-I$(silc_top_srcdir)/lib/silcclient \
-+	-I$(silc_top_srcdir)/lib/silcmath \
-+	-I$(silc_top_srcdir)/lib/silcapputil \
-+	-I$(silc_top_srcdir)/lib/silcskr \
-+	-I$(silc_top_srcdir)/lib/silcasn1 \
-+	-I$(silc_top_srcdir)/lib/silcske \
-+	-I$(silc_top_srcdir)/lib/silcsftp \
-+	-I$(silc_top_srcdir)/lib/silccore \
-+	-I$(silc_top_srcdir)/lib/silcutil \
-+	-DHAVE_CONFIG_H=1 -DSILC_PLUGIN=1 \
-+	-DPACKAGE=\"silc-client\" -DVERSION=\"$(VERSION)\" \
-+	-I${LOCALBASE}/include/glib-2.0 \
-+	-I${LOCALBASE}/lib/glib-2.0/include	
- 
- moduledir = @SILC_IRSSIDIR@
- IRSSI_INCLUDE = ../../..
-@@ -327,7 +348,7 @@
- 	$(LBDD)
- 
- libsilc_core_la_LDFLAGS = \
--	$(LBDFLGS)
-+	-L$(silc_top_srcdir)/lib/.libs
- 
- noinst_HEADERS = \
- 	module.h \
diff --git a/net/silc-client/files/extra-patch-apps__irssi__src__silc__core__client_ops.c b/net/silc-client/files/extra-patch-apps__irssi__src__silc__core__client_ops.c
deleted file mode 100644
index 634b737ed8bb..000000000000
--- a/net/silc-client/files/extra-patch-apps__irssi__src__silc__core__client_ops.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- ./apps/irssi/src/silc/core/client_ops.c.orig	2008-12-13 15:30:25.000000000 -0500
-+++ ./apps/irssi/src/silc/core/client_ops.c	2010-08-16 08:16:57.000000000 -0400
-@@ -2790,6 +2790,15 @@
-   silc_free(a);
- }
- 
-+/* helper function to emulate server_setup_find_port */
-+static SERVER_SETUP_REC *silc_server_setup_find_port(const char *address,
-+						     int port) {
-+  SERVER_SETUP_REC *rec;
-+
-+  rec = server_setup_find(address, port, NULL);
-+  return (rec == NULL || rec->port != port) ? NULL : rec;
-+}
-+
- /* Find authentication data by hostname and port. The hostname may be IP
-    address as well.*/
- 
-@@ -2811,7 +2820,7 @@
- 
-   /* Check whether we find the password for this server in our
-      configuration.  If it's set, always send it server. */
--  setup = server_setup_find_port(hostname, port);
-+  setup = silc_server_setup_find_port(hostname, port);
-   if (setup && setup->password) {
-     completion(SILC_AUTH_PASSWORD, setup->password, strlen(setup->password),
- 	       context);
diff --git a/net/silc-client/files/extra-patch-apps__irssi__src__silc__core__silc-core.c b/net/silc-client/files/extra-patch-apps__irssi__src__silc__core__silc-core.c
deleted file mode 100644
index be83f6a29268..000000000000
--- a/net/silc-client/files/extra-patch-apps__irssi__src__silc__core__silc-core.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./apps/irssi/src/silc/core/silc-core.c.orig	2010-08-16 09:37:58.000000000 -0400
-+++ ./apps/irssi/src/silc/core/silc-core.c	2010-08-16 09:38:17.000000000 -0400
-@@ -41,6 +41,7 @@
- #include "fe-common/core/fe-channels.h"
- #include "fe-common/core/keyboard.h"
- #include "fe-common/silc/module-formats.h"
-+#include "glib/goption.h"
- 
- #ifndef SILC_PLUGIN
- /* Command line option variables */
diff --git a/net/silc-client/files/extra-patch-apps__irssi__src__silc__core__silc-expandos.c b/net/silc-client/files/extra-patch-apps__irssi__src__silc__core__silc-expandos.c
deleted file mode 100644
index 9d43a22b4d27..000000000000
--- a/net/silc-client/files/extra-patch-apps__irssi__src__silc__core__silc-expandos.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./apps/irssi/src/silc/core/silc-expandos.c.orig	2010-08-16 09:37:26.000000000 -0400
-+++ ./apps/irssi/src/silc/core/silc-expandos.c	2010-08-16 09:37:45.000000000 -0400
-@@ -29,6 +29,7 @@
- #include "silc-channels.h"
- #include "silc-queries.h"
- #include "silc-nicklist.h"
-+#include "silcdefs.h"
- 
- EXPANDO_FUNC old_expando_usermode,
-             old_expando_cumode,
diff --git a/net/silc-client/files/patch-apps__irssi__Makefile.in b/net/silc-client/files/patch-apps__irssi__Makefile.in
deleted file mode 100644
index 8ff69bf5206b..000000000000
--- a/net/silc-client/files/patch-apps__irssi__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./apps/irssi/Makefile.in.orig	Mon Jun  4 05:22:15 2007
-+++ ./apps/irssi/Makefile.in	Tue Jun  5 00:55:54 2007
-@@ -813,7 +813,7 @@
- 	-mkdir -p $(mandir)/man1
- 
- doc-install-client:
--	$(INSTALL_DATA) $(silc_top_srcdir)/apps/irssi/silc.conf $(docdir)/example_silc.conf
-+	$(INSTALL_DATA) $(silc_top_srcdir)/apps/irssi/silc.conf $(sysconfdir)/silc.conf.sample
- 	-@if test -f $(silc_top_srcdir)/doc/silc.1 ; then \
- 	 $(INSTALL_DATA) $(silc_top_srcdir)/doc/silc.1 $(mandir)/man1; \
- 	fi
diff --git a/net/silc-client/files/patch-apps__irssi__src__fe-common__core__Makefile.in b/net/silc-client/files/patch-apps__irssi__src__fe-common__core__Makefile.in
deleted file mode 100644
index 9bef9c3f5099..000000000000
--- a/net/silc-client/files/patch-apps__irssi__src__fe-common__core__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- apps/irssi/src/fe-common/core/Makefile.in.orig	2008-08-04 01:07:44.645887439 +0000
-+++ apps/irssi/src/fe-common/core/Makefile.in	2008-08-04 01:08:32.222911335 +0000
-@@ -266,7 +266,7 @@
- #
- # INCLUDE defines
- #
--INCLUDES = $(ADD_INCLUDES) $(SILC_CFLAGS) -DHAVE_SILCDEFS_H \
-+INCLUDES = -I../../../src/core $(ADD_INCLUDES) $(SILC_CFLAGS) -DHAVE_SILCDEFS_H \
- 	-I$(srcdir) -I$(top_srcdir) -I$(silc_top_srcdir) \
- 	$(SILC_LIB_INCLUDES) -I$(silc_top_srcdir)/includes \
- 	-I$(silc_top_srcdir)/doc -I$(top_srcdir)/src \
diff --git a/net/silc-client/files/patch-doc__Makefile.in b/net/silc-client/files/patch-doc__Makefile.in
deleted file mode 100644
index 663a0c22b384..000000000000
--- a/net/silc-client/files/patch-doc__Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- doc/Makefile.in.orig	2009-01-20 20:13:01.139663433 -0500
-+++ doc/Makefile.in	2009-01-20 20:13:47.606687594 -0500
-@@ -452,14 +452,6 @@
- 	$(SILC_TOP_SRCDIR)/scripts/manpages.pl
- 
- doc-install:
--	-mkdir -p $(docdir)
--	-$(INSTALL_DATA) $(top_srcdir)/doc/FAQ $(docdir)/
--	-$(INSTALL_DATA) $(top_srcdir)/COPYING $(docdir)/
--	-$(INSTALL_DATA) $(top_srcdir)/ChangeLog $(docdir)/
--	-$(INSTALL_DATA) $(top_srcdir)/CREDITS $(docdir)/
--	-$(INSTALL_DATA) $(top_srcdir)/README* $(docdir)/
--	-$(INSTALL_DATA) $(top_srcdir)/INSTALL $(docdir)/
--	-$(INSTALL_DATA) $(top_srcdir)/TODO $(docdir)/
- 
- install-data-hook:	doc-install
- 
diff --git a/net/silc-client/pkg-descr b/net/silc-client/pkg-descr
deleted file mode 100644
index eead8f7efb1d..000000000000
--- a/net/silc-client/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-[ from developer's site FAQ ]
-
-This is a SILC network client
-
-Q: What is SILC?
-
-A: SILC (Secure Internet Live Conferencing) is a protocol which
-provides secure conferencing services in the Internet over insecure
-channel. SILC is IRC like although internally they are very different.
-Biggest similarity between SILC and IRC is that they both provide
-conferencing services and that SILC has almost same commands as
-IRC. Other than that they are nothing alike.
-
-Biggest differences are that SILC is secure what IRC is not in any
-way.  The network model is also entirely different compared to IRC.
-
-WWW: http://www.silcnet.org/
diff --git a/net/silc-client/pkg-plist b/net/silc-client/pkg-plist
deleted file mode 100644
index 95fc50a167e4..000000000000
--- a/net/silc-client/pkg-plist
+++ /dev/null
@@ -1,145 +0,0 @@
-bin/silc
-lib/libsilc-1.1.so
-lib/libsilc-1.1.so.3
-lib/libsilc.la
-lib/libsilc.so
-lib/libsilcclient-1.1.so
-lib/libsilcclient-1.1.so.3
-lib/libsilcclient.la
-lib/libsilcclient.so
-%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/Irssi.pm
-%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/Irssi/Silc.pm
-%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/Irssi/TextUI.pm
-%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/Irssi/UI.pm
-%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/.packlist
-%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/Irssi.so
-%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/Silc/.packlist
-%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/Silc/Silc.so
-%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/TextUI/.packlist
-%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/TextUI/TextUI.so
-%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/UI/.packlist
-%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/UI/UI.so
-%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/perllocal.pod
-%%DATADIR%%/help/action
-%%DATADIR%%/help/admin
-%%DATADIR%%/help/alias
-%%DATADIR%%/help/attr
-%%DATADIR%%/help/away
-%%DATADIR%%/help/ban
-%%DATADIR%%/help/beep
-%%DATADIR%%/help/bind
-%%DATADIR%%/help/cat
-%%DATADIR%%/help/cd
-%%DATADIR%%/help/channel
-%%DATADIR%%/help/clear
-%%DATADIR%%/help/close
-%%DATADIR%%/help/cmode
-%%DATADIR%%/help/connect
-%%DATADIR%%/help/cumode
-%%DATADIR%%/help/cycle
-%%DATADIR%%/help/date
-%%DATADIR%%/help/dehilight
-%%DATADIR%%/help/detach
-%%DATADIR%%/help/disconnect
-%%DATADIR%%/help/echo
-%%DATADIR%%/help/eval
-%%DATADIR%%/help/exec
-%%DATADIR%%/help/file
-%%DATADIR%%/help/format
-%%DATADIR%%/help/getkey
-%%DATADIR%%/help/help
-%%DATADIR%%/help/hilight
-%%DATADIR%%/help/ignore
-%%DATADIR%%/help/info
-%%DATADIR%%/help/invite
-%%DATADIR%%/help/invitelist
-%%DATADIR%%/help/join
-%%DATADIR%%/help/key
-%%DATADIR%%/help/kick
-%%DATADIR%%/help/kickban
-%%DATADIR%%/help/kill
-%%DATADIR%%/help/knockout
-%%DATADIR%%/help/lastlog
-%%DATADIR%%/help/layout
-%%DATADIR%%/help/levels
-%%DATADIR%%/help/list
-%%DATADIR%%/help/listkeys
-%%DATADIR%%/help/load
-%%DATADIR%%/help/log
-%%DATADIR%%/help/me
-%%DATADIR%%/help/motd
-%%DATADIR%%/help/mmsg
-%%DATADIR%%/help/msg
-%%DATADIR%%/help/names
-%%DATADIR%%/help/nick
-%%DATADIR%%/help/notice
-%%DATADIR%%/help/oper
-%%DATADIR%%/help/part
-%%DATADIR%%/help/perlflush
-%%DATADIR%%/help/ping
-%%DATADIR%%/help/query
-%%DATADIR%%/help/quit
-%%DATADIR%%/help/recode
-%%DATADIR%%/help/reconnect
-%%DATADIR%%/help/reload
-%%DATADIR%%/help/rmreconns
-%%DATADIR%%/help/rmrejoins
-%%DATADIR%%/help/save
-%%DATADIR%%/help/sconnect
-%%DATADIR%%/help/script
-%%DATADIR%%/help/scrollback
-%%DATADIR%%/help/server
-%%DATADIR%%/help/set
-%%DATADIR%%/help/shutdown
-%%DATADIR%%/help/silcnet
-%%DATADIR%%/help/silcoper
-%%DATADIR%%/help/smsg
-%%DATADIR%%/help/stats
-%%DATADIR%%/help/statusbar
-%%DATADIR%%/help/toggle
-%%DATADIR%%/help/topic
-%%DATADIR%%/help/umode
-%%DATADIR%%/help/unalias
-%%DATADIR%%/help/unignore
-%%DATADIR%%/help/unload
-%%DATADIR%%/help/unquery
-%%DATADIR%%/help/users
-%%DATADIR%%/help/version
-%%DATADIR%%/help/watch
-%%DATADIR%%/help/whois
-%%DATADIR%%/help/whowas
-%%DATADIR%%/help/window
-%%DATADIR%%/themes/default.theme
-%%DATADIR%%/themes/plugin.theme
-%%DATADIR%%/scripts/autoop.pl
-%%DATADIR%%/scripts/autorejoin.pl
-%%DATADIR%%/scripts/buf.pl
-%%DATADIR%%/scripts/command.pl
-%%DATADIR%%/scripts/dns.pl
-%%DATADIR%%/scripts/kills.pl
-%%DATADIR%%/scripts/mail.pl
-%%DATADIR%%/scripts/mlock.pl
-%%DATADIR%%/scripts/msg-event.pl
-%%DATADIR%%/scripts/quitmsg.pl
-%%DATADIR%%/scripts/redirect.pl
-%%DATADIR%%/scripts/scriptassist.pl
-%%DATADIR%%/scripts/silc.pl
-%%DATADIR%%/scripts/splitlong.pl
-%%DATADIR%%/scripts/usercount.pl
-@unexec if cmp -s %D/etc/silc.conf.sample %D/etc/silc.conf; then rm -f %D/etc/silc.conf; fi
-etc/silc.conf.sample
-@exec if [ ! -f %D/etc/silc.conf ] ; then cp -p %D/%F %B/silc.conf; fi
-%%WITH_PERL%%@dirrm lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/Silc
-%%WITH_PERL%%@dirrm lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/TextUI
-%%WITH_PERL%%@dirrm lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/UI
-%%WITH_PERL%%@dirrm lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi
-%%WITH_PERL%%@dirrm lib/silc/perl/%%PERL_ARCHNAME%%/auto
-%%WITH_PERL%%@dirrm lib/silc/perl/%%PERL_ARCHNAME%%/Irssi
-%%WITH_PERL%%@dirrm lib/silc/perl/%%PERL_ARCHNAME%%
-%%WITH_PERL%%@dirrm lib/silc/perl
-@dirrmtry lib/silc
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
diff --git a/net/silc-irssi-plugin/Makefile b/net/silc-irssi-plugin/Makefile
deleted file mode 100644
index f61a7bfa009b..000000000000
--- a/net/silc-irssi-plugin/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-CATEGORIES=	net irc
-
-COMMENT=	SILC plugin for IRSSI
-
-USE_LDCONFIG=	${PREFIX}/lib/irssi/modules
-
-MASTERDIR=	${.CURDIR}/../silc-client
-PLIST=		${.CURDIR}/pkg-plist
-DESCR=		${.CURDIR}/pkg-descr
-
-CONFLICTS=	silc-toolkit-1.1.* silc-client-1.1.*
-
-IRSSI_PLUGIN=	-irssi
-
-NO_STAGE=	yes
-.include "${MASTERDIR}/Makefile"
diff --git a/net/silc-irssi-plugin/pkg-descr b/net/silc-irssi-plugin/pkg-descr
deleted file mode 100644
index e432cd6b1f5c..000000000000
--- a/net/silc-irssi-plugin/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-A plugin for IRSSI which implements the SILC (Secure Internet Live
-Conferencing) protocol.
-
-WWW: http://www.silcnet.org
diff --git a/net/silc-irssi-plugin/pkg-plist b/net/silc-irssi-plugin/pkg-plist
deleted file mode 100644
index 2b19c88bfd1f..000000000000
--- a/net/silc-irssi-plugin/pkg-plist
+++ /dev/null
@@ -1,124 +0,0 @@
-lib/irssi/modules/libfe_common_silc.a
-lib/irssi/modules/libfe_common_silc.la
-lib/irssi/modules/libfe_common_silc.so
-lib/irssi/modules/libfe_common_silc.so.0
-lib/irssi/modules/libsilc_core.a
-lib/irssi/modules/libsilc_core.la
-lib/irssi/modules/libsilc_core.so
-lib/irssi/modules/libsilc_core.so.0
-lib/libsilc-1.1.so
-lib/libsilc-1.1.so.3
-lib/libsilc.la
-lib/libsilc.so
-lib/libsilcclient-1.1.so
-lib/libsilcclient-1.1.so.3
-lib/libsilcclient.la
-lib/libsilcclient.so
-share/irssi/help/silc/action
-share/irssi/help/silc/admin
-share/irssi/help/silc/alias
-share/irssi/help/silc/attr
-share/irssi/help/silc/away
-share/irssi/help/silc/ban
-share/irssi/help/silc/beep
-share/irssi/help/silc/bind
-share/irssi/help/silc/cat
-share/irssi/help/silc/cd
-share/irssi/help/silc/channel
-share/irssi/help/silc/clear
-share/irssi/help/silc/close
-share/irssi/help/silc/cmode
-share/irssi/help/silc/connect
-share/irssi/help/silc/cumode
-share/irssi/help/silc/cycle
-share/irssi/help/silc/date
-share/irssi/help/silc/dehilight
-share/irssi/help/silc/detach
-share/irssi/help/silc/disconnect
-share/irssi/help/silc/echo
-share/irssi/help/silc/eval
-share/irssi/help/silc/exec
-share/irssi/help/silc/file
-share/irssi/help/silc/format
-share/irssi/help/silc/getkey
-share/irssi/help/silc/help
-share/irssi/help/silc/hilight
-share/irssi/help/silc/ignore
-share/irssi/help/silc/info
-share/irssi/help/silc/invite
-share/irssi/help/silc/invitelist
-share/irssi/help/silc/join
-share/irssi/help/silc/key
-share/irssi/help/silc/kick
-share/irssi/help/silc/kickban
-share/irssi/help/silc/kill
-share/irssi/help/silc/knockout
-share/irssi/help/silc/lastlog
-share/irssi/help/silc/layout
-share/irssi/help/silc/levels
-share/irssi/help/silc/list
-share/irssi/help/silc/listkeys
-share/irssi/help/silc/load
-share/irssi/help/silc/log
-share/irssi/help/silc/me
-share/irssi/help/silc/mmsg
-share/irssi/help/silc/motd
-share/irssi/help/silc/msg
-share/irssi/help/silc/names
-share/irssi/help/silc/nick
-share/irssi/help/silc/notice
-share/irssi/help/silc/oper
-share/irssi/help/silc/part
-share/irssi/help/silc/perlflush
-share/irssi/help/silc/ping
-share/irssi/help/silc/query
-share/irssi/help/silc/quit
-share/irssi/help/silc/recode
-share/irssi/help/silc/reconnect
-share/irssi/help/silc/reload
-share/irssi/help/silc/rmreconns
-share/irssi/help/silc/rmrejoins
-share/irssi/help/silc/save
-share/irssi/help/silc/sconnect
-share/irssi/help/silc/script
-share/irssi/help/silc/scrollback
-share/irssi/help/silc/server
-share/irssi/help/silc/set
-share/irssi/help/silc/shutdown
-share/irssi/help/silc/silc
-share/irssi/help/silc/silcnet
-share/irssi/help/silc/silcoper
-share/irssi/help/silc/smsg
-share/irssi/help/silc/stats
-share/irssi/help/silc/statusbar
-share/irssi/help/silc/toggle
-share/irssi/help/silc/topic
-share/irssi/help/silc/umode
-share/irssi/help/silc/unalias
-share/irssi/help/silc/unignore
-share/irssi/help/silc/unload
-share/irssi/help/silc/unquery
-share/irssi/help/silc/users
-share/irssi/help/silc/version
-share/irssi/help/silc/watch
-share/irssi/help/silc/whois
-share/irssi/help/silc/whowas
-share/irssi/help/silc/window
-share/irssi/scripts/silc.pl
-share/irssi/themes/plugin.theme
-lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/Silc/Silc.so
-lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/Silc/.packlist
-lib/silc/perl/%%PERL_ARCHNAME%%/Irssi/Silc.pm
-lib/silc/perl/%%PERL_ARCHNAME%%/perllocal.pod
-@dirrmtry share/irssi/themes
-@dirrmtry share/irssi/scripts
-@dirrmtry share/irssi/help/silc
-@dirrmtry share/irssi/help
-@dirrmtry share/irssi
-@dirrmtry lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/Silc
-@dirrmtry lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi
-@dirrmtry lib/silc/perl/%%PERL_ARCHNAME%%/auto
-@dirrmtry lib/silc/perl/%%PERL_ARCHNAME%%/Irssi
-@dirrmtry lib/silc/perl/%%PERL_ARCHNAME%%
-@dirrmtry lib/silc/perl
-@dirrmtry lib/silc
diff --git a/net/silc-server/Makefile b/net/silc-server/Makefile
deleted file mode 100644
index 1c9a718b0314..000000000000
--- a/net/silc-server/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	silc
-PORTVERSION=	1.1.18
-CATEGORIES=	net ipv6 security
-MASTER_SITES=	http://www.silcnet.org/download/%SUBDIR%/ \
-		http://ftp.silcnet.org/%SUBDIR%/ \
-		http://www.nic.funet.fi/pub/mirrors/ftp.silcnet.org/silc/%SUBDIR%/ \
-		http://ftp.sunet.se/pub/network/silc/%SUBDIR%/ \
-		ftp://ftp.silcnet.org/silc/%SUBDIR%/ \
-		ftp://ftp.funet.fi/pub/mirrors/ftp.silcnet.org/silc/%SUBDIR%/ \
-		ftp://ftp.sunet.se/pub/network/silc/%SUBDIR%/
-MASTER_SITE_SUBDIR=	server/sources
-PKGNAMESUFFIX=	-server
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Secure Internet Live Conferencing (SILC) network server
-
-LIB_DEPENDS=	libsilc-1.1.so:${PORTSDIR}/devel/silc-toolkit
-
-SUB_FILES=	pkg-message pkg-deinstall
-USE_RC_SUBR=	silcd
-USES=		gmake tar:bzip2
-GNU_CONFIGURE=	yes
-CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
-CONFIGURE_ARGS=	--with-silcd-config-file=${PREFIX}/etc/${PORTNAME}/silcd.conf \
-		--sysconfdir=${PREFIX}/etc/${PORTNAME} \
-		--with-helpdir=share/${PORTNAME}/help \
-		--with-logsdir=/var/log/${PORTNAME} \
-		--with-silcd-pid-file=/var/run/silcd.pid \
-		--enable-ipv6 \
-		--enable-debug
-
-MAN5=	silcd.conf.5
-MAN8=	silcd.8
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386"
-CONFIGURE_ARGS+=	--disable-asm
-.endif
-
-post-patch:
-.ifdef(NOPORTEXAMPLES)
-	@${REINPLACE_CMD} -E -e \
-		'/examples-install.*\\/d' \
-		${WRKSRC}/apps/silcd/Makefile.in
-.endif
-	@${REINPLACE_CMD} -e 's/--libtool-enable-shared//' \
-		${WRKSRC}/lib/silccrypt/Makefile.in
-
-post-install:
-	@if [ ! -f ${PREFIX}/etc/silc/silcd.conf ]; then \
-		${CP} -p ${PREFIX}/etc/silc/silcd.conf.sample ${PREFIX}/etc//silc/silcd.conf; \
-	fi
-	@if [ ! -f ${PREFIX}/etc/silc/silcalgs.conf ]; then \
-		${CP} -p ${PREFIX}/etc/silc/silcalgs.conf.sample ${PREFIX}/etc/silc/silcalgs.conf; \
-	fi
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/net/silc-server/distinfo b/net/silc-server/distinfo
deleted file mode 100644
index b5911d725af9..000000000000
--- a/net/silc-server/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (silc-server-1.1.18.tar.bz2) = 1a0d4efb5683b3148b3ba91d5b56fff60875bc8bb97e854330714d927986205b
-SIZE (silc-server-1.1.18.tar.bz2) = 908188
diff --git a/net/silc-server/files/patch-apps:silcd:Makefile.in b/net/silc-server/files/patch-apps:silcd:Makefile.in
deleted file mode 100644
index d3b5e32dd727..000000000000
--- a/net/silc-server/files/patch-apps:silcd:Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
---- ./apps/silcd/Makefile.in.orig	2009-01-20 19:16:34.173984834 -0500
-+++ ./apps/silcd/Makefile.in	2009-01-20 19:38:32.379638067 -0500
-@@ -577,14 +577,11 @@
- 
- 
- install-dirs-server:
--	-mkdir -p $(docdir)
- 	-mkdir -p $(etcdir)
--	-mkdir -p $(logsdir)
- 	-mkdir -p $(mandir)/man5
- 	-mkdir -p $(mandir)/man8
- 
- doc-install-server:
--	-$(INSTALL_DATA) $(top_srcdir)/doc/example_silcd.conf $(docdir)/
- 	-@if test -f $(top_srcdir)/doc/silcd.8 ; then \
- 	 $(INSTALL_DATA) $(top_srcdir)/doc/silcd.8 $(mandir)/man8; \
- 	fi
-@@ -593,22 +590,17 @@
- 	fi
- 
- etc-install-server:
--	-@if test '!' -f $(etcdir)/silcd.conf ; then \
- 	  $(INSTALL_DATA) $(top_srcdir)/doc/example_silcd.conf \
--		$(etcdir)/silcd.conf; \
-+		$(etcdir)/silcd.conf.sample; \
- 	  $(INSTALL_DATA) $(top_srcdir)/doc/silcalgs.conf \
--		$(etcdir)/silcalgs.conf; \
--          chmod go= $(etcdir)/silcd.conf; \
--	fi
-+		$(etcdir)/silcalgs.conf.sample; \
- 
- examples-install:
--	-mkdir -p $(docdir)/examples/
--	-$(INSTALL_DATA) $(top_srcdir)/doc/examples/* $(docdir)/examples/
-+	-mkdir -p $(prefix)/share/examples/silc
-+	-$(INSTALL_DATA) $(top_srcdir)/doc/examples/README $(prefix)/share/examples/silc
-+	-$(INSTALL_DATA) $(top_srcdir)/doc/examples/cell* $(prefix)/share/examples/silc
- 
- generate-server-key:
--	-@if test '!' -f $(etcdir)/silcd.pub ; then \
--	  $(sbindir)/silcd -C $(etcdir); \
--	fi
- 
- install-data-hook: 		\
- 	install-dirs-server 	\
diff --git a/net/silc-server/files/patch-configure b/net/silc-server/files/patch-configure
deleted file mode 100644
index 855c335539d3..000000000000
--- a/net/silc-server/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Tue Dec 31 17:49:16 2002
-+++ configure	Tue Dec 31 17:49:55 2002
-@@ -14526,7 +14526,7 @@
-       fi
-       ;;
-     *-*-freebsd*)
--      CFLAGS="$CFLAGS -D_THREAD_SAFE"
-+      CFLAGS="$CFLAGS"
-       ;;
-     *-*-sysv5uw7*)  # UnixWare 7
-       if test "$GCC" != "yes"; then
diff --git a/net/silc-server/files/patch-doc:Makefile.in b/net/silc-server/files/patch-doc:Makefile.in
deleted file mode 100644
index eb6314e98244..000000000000
--- a/net/silc-server/files/patch-doc:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Wed Dec 14 15:47:35 2005
-+++ doc/Makefile.in	Thu Aug 10 13:38:49 2006
-@@ -477,7 +477,7 @@
- 	-$(INSTALL_DATA) $(top_srcdir)/INSTALL $(docdir)/
- 	-$(INSTALL_DATA) $(top_srcdir)/TODO $(docdir)/
- 
--install-data-hook:	doc-install
-+install-data-hook:
- 
- @INCLUDE_DEFINES_INT@
- 
diff --git a/net/silc-server/files/patch-doc:example_silcd.conf.in b/net/silc-server/files/patch-doc:example_silcd.conf.in
deleted file mode 100644
index 2656c89fbe4c..000000000000
--- a/net/silc-server/files/patch-doc:example_silcd.conf.in
+++ /dev/null
@@ -1,60 +0,0 @@
---- doc/example_silcd.conf.in.orig	2007-11-04 03:39:39.000000000 -0500
-+++ doc/example_silcd.conf.in	2007-12-26 11:51:20.000000000 -0500
-@@ -22,7 +22,6 @@
- # Include global algorithms from the "silcalgs.conf" file.  This file defines
- # ciphers, hash functions, HMACs and PKCS algorithms that can be used.
- #
--Include "@ETCDIR@/silcalgs.conf";
- 
- #
- # General configuration options
-@@ -482,13 +481,13 @@
- # to true.  For normal connections set it false.  If it is set to true then
- # your server will be backup router.
- #
--ServerConnection {
--	Host = "10.2.1.7";
--	Passphrase = "verysecret";
--	#PublicKey = "/path/to/the/public.pub";
--	Params = "normal";
--	Backup = false;
--};
-+#ServerConnection {
-+#	Host = "10.2.1.7";
-+#	Passphrase = "verysecret";
-+#	#PublicKey = "/path/to/the/public.pub";
-+#	Params = "normal";
-+#	Backup = false;
-+#};
- 
- #
- # Configured router connections
-@@ -518,17 +517,17 @@
- # backup router is in our cell then set the "BackupLocal" option to true.
- # If the backup router is in other cell then set it to false.
- #
--RouterConnection {
--	Host = "10.2.1.100";
--	Port = 706;
--	Passphrase = "verysecret";
--	#PublicKey = "/path/to/the/public.pub";
--	Params = "normal";
--	Initiator = true;
--	#BackupHost = "10.2.1.6";
--	#BackupPort = 706;
--	#BackupLocal = true;
--};
-+#RouterConnection {
-+#	Host = "10.2.1.100";
-+#	Port = 706;
-+#	Passphrase = "verysecret";
-+#	#PublicKey = "/path/to/the/public.pub";
-+#	Params = "normal";
-+#	Initiator = true;
-+#	#BackupHost = "10.2.1.6";
-+#	#BackupPort = 706;
-+#	#BackupLocal = true;
-+#};
- 
- #
- # Denied connections
diff --git a/net/silc-server/files/pkg-deinstall.in b/net/silc-server/files/pkg-deinstall.in
deleted file mode 100644
index f0fe894b3e4c..000000000000
--- a/net/silc-server/files/pkg-deinstall.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-KEY_FILES="silcd.prv silcd.pub"
-
-case "$2" in
-POST-DEINSTALL)
-	if [ -f %%PREFIX%%/etc/silc/silcd.prv -o -f %%PREFIX%%/etc/silc/silcd.pub ]; then
-		echo "$1: The following files were left behind:"
-		for key_file in ${KEY_FILES}
-		do
-			[ -f %%PREFIX%%/etc/silc/${key_file} ] && echo "%%PREFIX%%/etc/silc/${key_file}"
-		done
-		echo "$1: If this port is not used anymore please remove them."
-	fi
-	;;
-*)
-	;;
-esac
-exit
diff --git a/net/silc-server/files/pkg-message.in b/net/silc-server/files/pkg-message.in
deleted file mode 100644
index 725f6d53c29a..000000000000
--- a/net/silc-server/files/pkg-message.in
+++ /dev/null
@@ -1,5 +0,0 @@
-******************************************************
-You will need to edit %%PREFIX%%/etc/silc/silcd.conf
-and make sure to change permissions to 400 if it
-contains sensitive information.
-******************************************************
diff --git a/net/silc-server/files/silcd.in b/net/silc-server/files/silcd.in
deleted file mode 100644
index 1e9caa32d08f..000000000000
--- a/net/silc-server/files/silcd.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: silcd
-# REQUIRE: NETWORKING
-#
-# Add the following line to /etc/rc.conf[.local] to enable silcd:
-#
-# silcd_enable="YES"
-#
-
-silcd_enable=${silcd_enable-"NO"}
-
-. /etc/rc.subr
-
-name=silcd
-rcvar=silcd_enable
-
-command=%%PREFIX%%/sbin/${name}
-pidfile=/var/run/${name}.pid
-
-extra_commands="keygen"
-keygen_cmd="silcd_keygen"
-start_precmd="silcd_precmd"
-
-silcd_keygen()
-{
-	umask 077
-	${command} -C %%PREFIX%%/etc/silc
-}
-
-silcd_precmd()
-{
-	if [ ! -f %%PREFIX%%/etc/silc/silcd.prv -a ! -f %%PREFIX%%/etc/silc/silcd.pub ]; then
-		run_rc_command keygen
-	fi
-}
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/net/silc-server/pkg-descr b/net/silc-server/pkg-descr
deleted file mode 100644
index 0d94b58856c6..000000000000
--- a/net/silc-server/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-[ from developer's site FAQ ]
-
-This is a SILC network server
-
-Q: What is SILC?
-
-A: SILC (Secure Internet Live Conferencing) is a protocol which
-provides secure conferencing services in the Internet over insecure
-channel. SILC is IRC like although internally they are very different.
-Biggest similarity between SILC and IRC is that they both provide
-conferencing services and that SILC has almost same commands as
-IRC. Other than that they are nothing alike.
-
-Biggest differences are that SILC is secure what IRC is not in any
-way.  The network model is also entirely different compared to IRC.
-
-WWW: http://www.silcnet.org/
diff --git a/net/silc-server/pkg-plist b/net/silc-server/pkg-plist
deleted file mode 100644
index 7b8c966deb21..000000000000
--- a/net/silc-server/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-sbin/silcd
-@unexec if cmp -s %D/etc/silc/silcd.conf.sample %D/etc/silc/silcd.conf; then rm -f %D/etc/silc/silcd.conf; fi
-etc/silc/silcd.conf.sample
-@exec if [ ! -f %D/etc/silc/silcd.conf ] ; then cp -p %D/%F %B/silcd.conf; fi
-@unexec if cmp -s %D/etc/silc/silcalgs.conf.sample %D/etc/silc/silcalgs.conf; then rm -f %D/etc/silc/silcalgs.conf; fi
-etc/silc/silcalgs.conf.sample
-@exec if [ ! -f %D/etc/silc/silcalgs.conf ] ; then cp -p %D/%F %B/silcalgs.conf; fi
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cell_backup.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cell_router.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cell_server1.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cell_server2.conf
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry etc/silc
-@dirrmtry var/log/silc
diff --git a/net/skyfish/Makefile b/net/skyfish/Makefile
deleted file mode 100644
index 83613e15c801..000000000000
--- a/net/skyfish/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# Created by: Nsand <nsand@sura.ru>
-# $FreeBSD$
-
-PORTNAME=	skyfish
-PORTVERSION=	0.91
-CATEGORIES=	net kld
-MASTER_SITES=	ftp://ftp.lissyara.su/users/nsand/skyfish/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Grabbing TCP streams from network interface (SAT internet)
-
-SSP_UNSAFE=	kernel module does not support ssp
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-SYSDIR?=	${SRC_BASE}/sys
-KMODDIR=	/boot/modules
-PLIST_SUB+=	KMODDIR=${KMODDIR}
-
-MAN1=		skyfish.1
-MANCOMPRESSED=	yes
-
-pre-fetch:
-.if !exists(${SYSDIR}/Makefile)
-	@${ECHO} "*************************************************"; \
-	${ECHO}  "This port requires the kernel source be available"; \
-	${ECHO}  "*************************************************"; \
-	exit 1
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/skyfish/distinfo b/net/skyfish/distinfo
deleted file mode 100644
index ffad15db6a3b..000000000000
--- a/net/skyfish/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (skyfish-0.91.tar.gz) = dbda8404c832fe79f654565cf2e6b406849df92c87f59f914aee7509d0e5648a
-SIZE (skyfish-0.91.tar.gz) = 61489
diff --git a/net/skyfish/files/patch-8x b/net/skyfish/files/patch-8x
deleted file mode 100644
index 780b3c8f9d0f..000000000000
--- a/net/skyfish/files/patch-8x
+++ /dev/null
@@ -1,15 +0,0 @@
---- module/drv.h.orig	2008-10-14 12:50:44.000000000 +0400
-+++ module/drv.h	2009-07-23 22:03:04.000000000 +0400
-@@ -89,7 +89,12 @@
- 		if (fifobuf == NULL) {
- 			    printf("no memory for buffer\n");
- 			    return -1;}
-+#if __FreeBSD_version < 800000
- 		knlist_init(&echo_rsel.si_note, NULL, NULL, NULL, NULL);
-+#else
-+		knlist_init(&echo_rsel.si_note, NULL, NULL, NULL, NULL,NULL);
-+#endif
-+		
- 		socketlock = 0;
-                       break;
-        case MOD_UNLOAD:
diff --git a/net/skyfish/files/patch-prefix b/net/skyfish/files/patch-prefix
deleted file mode 100644
index acef08a1cf3d..000000000000
--- a/net/skyfish/files/patch-prefix
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-Patch attached with submission follows:
-
---- bin/Makefile.orig	2008-10-11 18:05:45.000000000 +0400
-+++ bin/Makefile	2009-06-30 22:04:35.000000000 +0400
-@@ -5,9 +5,8 @@
- SRCS= db.c db.h file_sky.c file_sky.h parse_http.c parse_http.h skyfish.h skyfish.c my_types.h \
- 	interface.h interface.c sky_node.c sky_node.h sky_conf.c sky_conf.h sky_shm.c sky_shm.h convert.h convert.c
- PROG= skyfish
--PREFIX=/usr/local
- NO_MAN=
--BINDIR= /usr/local/bin
-+BINDIR= ${PREFIX}/bin
- BINOWN= root
- BINGRP= wheel
- BINMODE= 4550
---- doc/Makefile.orig	2008-09-16 09:24:53.000000000 +0400
-+++ doc/Makefile	2009-06-30 22:04:47.000000000 +0400
-@@ -1,14 +1,12 @@
- 
- NO_MAN=
- 
--PREFIX=/usr/local/share/doc/skyfish
--
- install:
--	mkdir -p ${PREFIX}
--	cp -f README ${PREFIX}
--	cp -f README.rus ${PREFIX}
--	cp -f COPYRIGHT ${PREFIX}	
--	cp -f CREDITS ${PREFIX}	
--	cp -f CHANGES ${PREFIX}
-+	mkdir -p ${PREFIX}/share/doc/skyfish
-+	cp -f README ${PREFIX}/share/doc/skyfish
-+	cp -f README.rus ${PREFIX}/share/doc/skyfish
-+	cp -f COPYRIGHT ${PREFIX}/share/doc/skyfish	
-+	cp -f CREDITS ${PREFIX}/share/doc/skyfish
-+	cp -f CHANGES ${PREFIX}/share/doc/skyfish
- 
- .include<bsd.prog.mk>
---- etc/Makefile.orig	2008-09-16 09:24:56.000000000 +0400
-+++ etc/Makefile	2009-06-30 22:04:53.000000000 +0400
-@@ -1,9 +1,7 @@
- 
--PREFIX=/usr/local/etc
--
- NO_MAN=
- 
- install:
--	cp -f skyfish.conf.dist ${PREFIX}
-+	cp -f skyfish.conf.dist ${PREFIX}/etc
- 
--.include<bsd.prog.mk>
-\ No newline at end of file
-+.include<bsd.prog.mk>
---- bin/interface.c.orig	2008-10-14 16:38:48.000000000 +0400
-+++ bin/interface.c	2009-06-30 22:19:27.000000000 +0400
-@@ -862,7 +862,14 @@
- 		
- 		bzero(&tmp2[0],320);
- 	    traf=db[i].rspeed;
--		if (traf == 0 && db[i].deltatime > 10) sprintf(tmp2,"|-[%4lu]s",db[i].deltatime);
-+		if (traf == 0 && db[i].deltatime > 10) {
-+			if (db[i].deltatime >= 3600)  
-+				sprintf(tmp2,"|-[%4lu]h",db[i].deltatime/3600);
-+			if (db[i].deltatime >= 60 && db[i].deltatime < 3600)
-+				sprintf(tmp2,"|-[%4lu]m",db[i].deltatime/60);
-+			else
-+				sprintf(tmp2,"|-[%4lu]s",db[i].deltatime);
-+			}
- 		else if (traf > GB) 		sprintf(tmp2,"|%4.0f G/s",traf/GBYTE);	
- 	    else if (traf > MB) 	sprintf(tmp2,"|%4.0f M/s",traf/MBYTE);
- 	    else if (traf > KB) 	sprintf(tmp2,"|%4.0f K/s",traf/KBYTE);
---- man/Makefile.orig	2008-09-16 09:24:57.000000000 +0400
-+++ man/Makefile	2009-06-28 23:33:36.000000000 +0400
-@@ -1,6 +1,6 @@
- #
- 
- MAN1= skyfish.1
--MANDIR = /usr/local/man/man
-+MANDIR = ${PREFIX}/man/man
- 
--.include<bsd.prog.mk>
-\ No newline at end of file
-+.include<bsd.prog.mk>
---- bin/my_types.h.orig	2008-10-13 09:33:00.000000000 +0400
-+++ bin/my_types.h	2009-06-28 23:52:19.000000000 +0400
-@@ -46,7 +46,7 @@
- #define CP1251	2
- 
- 
--static char VERSION[] = "0.90";
-+static char VERSION[] = "0.91";
- 
- #define	LENTMP 320
- #define	LENPATH 300
---- bin/skyfish.c.orig	2008-10-14 16:30:21.000000000 +0400
-+++ bin/skyfish.c	2009-06-28 23:51:59.000000000 +0400
-@@ -92,7 +92,7 @@
- 		fclose(fd);
- 		}
- 
--	while ((ch = getopt(argc, argv, "rdsi")) != -1)
-+	while ((ch = getopt(argc, argv, "rdsiv")) != -1)
- 		switch (ch) {
- 		case 'd': /* daemon mode */
- 			if (rpid > 0) {printf("Daemon already running\n");return 1;}
-@@ -119,8 +119,13 @@
- 			runmode=CLIENT;
- 			if (rpid == 0) {printf("No running daemon\n");return 1;}
- 			break;
-+		case 'v':
-+			printf("Skyfish version %s\n",VERSION);
-+			return 1;
-+			break;
- 		default:
- 			printf("read man skyfish\n");
-+			return 1;
- 			break;
- 		}
- 	if (argc < 2 && rpid > 0) {printf("Daemon already running\n");return 1;} 
-
-
diff --git a/net/skyfish/pkg-descr b/net/skyfish/pkg-descr
deleted file mode 100644
index 0c22b656b523..000000000000
--- a/net/skyfish/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Skyfish saves the information being sent via the HTTP protocol to disk.
-Allow filtering by type, file size and simultaneously listening several
-network interfaces. It's possible  to grab sattelite internet traffic.
-
-WWW: http://www.lissyara.su/?id=1677
diff --git a/net/skyfish/pkg-plist b/net/skyfish/pkg-plist
deleted file mode 100644
index 84b97af151cd..000000000000
--- a/net/skyfish/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/skyfish
-etc/skyfish.conf.dist
-share/doc/skyfish/README
-share/doc/skyfish/README.rus
-share/doc/skyfish/CHANGES
-share/doc/skyfish/COPYRIGHT
-share/doc/skyfish/CREDITS
-@dirrm share/doc/skyfish
-@cwd %%KMODDIR%%
-ng_skyfish.ko
-@unexec /bin/rm %D/skyfish2.ko.symbols 2>/dev/null || /usr/bin/true
-@unexec kldxref %D
diff --git a/net/skystar2/Makefile b/net/skystar2/Makefile
deleted file mode 100644
index 5ba2a616a6d5..000000000000
--- a/net/skystar2/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# Created by: Alex Keda <admin@lissyara.su>
-# $FreeBSD$
-
-PORTNAME=	skystar2
-PORTVERSION=	1.32
-PORTEPOCH=	1
-CATEGORIES=	net kld
-MASTER_SITES=	http://paradox.lissyara.su/ \
-		http://lissyara.su/patch/skystar2/
-DISTNAME=	${PORTNAME}.8_${PORTVERSION:S/.//}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Kernel module and program for SkyStar2/SkyStar2.8A
-
-USES=	tar:bzip2
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-SYSDIR?=	${SRC_BASE}/sys
-KMODDIR=	/boot/modules
-PLIST_SUB+=	KMODDIR=${KMODDIR}
-PORTDOCS=	readme
-
-pre-fetch:
-.if !exists(${SYSDIR}/Makefile)
-	@${ECHO} "*************************************************"; \
-	${ECHO}  "This port requires the kernel source be available"; \
-	${ECHO}  "*************************************************"; \
-	exit 1
-.endif
-
-post-extract:
-	@${REINPLACE_CMD} -e 's#/usr/local#${PREFIX}#g' \
-		${WRKSRC}/dvbnet/Makefile \
-		${WRKSRC}/dvbtune/Makefile \
-		${WRKSRC}/monitor/Makefile
-
-pre-install:
-	${INSTALL} -d ${KMODDIR}
-
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/etc/channels.conf.dist ${PREFIX}/etc/
-	@${CAT} ${PKGMESSAGE}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
-
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile on ia64, powerprc, or sparc64
-.elif ${OSVERSION} >= 900000
-BROKEN=		does not build
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/skystar2/distinfo b/net/skystar2/distinfo
deleted file mode 100644
index c035793ccd0d..000000000000
--- a/net/skystar2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (skystar2.8_132.tar.bz2) = 6bf76f04d8e772d857489cc76013dfdfe9e5b364a3d3bd8cf01d94e7480d7af5
-SIZE (skystar2.8_132.tar.bz2) = 140196
diff --git a/net/skystar2/pkg-descr b/net/skystar2/pkg-descr
deleted file mode 100644
index 76925b84c7b3..000000000000
--- a/net/skystar2/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-A driver for DVB-S card (producer TechniSat, Germany, http://www.technisat.com/)
-SkyStar 2 TV PCI on chip FlexCop II or FlexCop IIB by B2C2inc (SkyStar2).
-In this version of the driver there is no support of TV. Only data.
-Written by paradox (http://paradox.org.ua/).
-
-For additional information see readme in the source tarball.
-
-WWW: http://paradox.org.ua/
diff --git a/net/skystar2/pkg-message b/net/skystar2/pkg-message
deleted file mode 100644
index 79a161e8d08f..000000000000
--- a/net/skystar2/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-
-*********************************************************************
-To use these drivers, make sure that you have loaded the skystar2
-kernel module, by doing
-
-       # kldload skystar2
-
-or adding
-
-       skystar2_load="YES"
-
-to your /boot/loader.conf.
-*********************************************************************
diff --git a/net/skystar2/pkg-plist b/net/skystar2/pkg-plist
deleted file mode 100644
index 60ccbd7e2558..000000000000
--- a/net/skystar2/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/dvbnet
-bin/dvbtune
-bin/monitor
-etc/channels.conf.dist
-@cwd %%KMODDIR%%
-skystar2.ko
-@unexec /bin/rm %D/skystar2.ko.symbols 2>/dev/null || /usr/bin/true
-@unexec kldxref %D
diff --git a/net/tac_plus-libradius/Makefile b/net/tac_plus-libradius/Makefile
deleted file mode 100644
index 7983198f5185..000000000000
--- a/net/tac_plus-libradius/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by: Martin Mersberger <gremlin@portal-to-web.de>
-# $FreeBSD$
-
-PORTNAME=	tac_plus-libradius
-PORTVERSION=	5.0.0
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	http://www.portal-to-web.de/tacacs/ \
-		http://www.santel.lu/projects/ldap-tacacs/
-DISTFILES=	tac_plus.F5.0.0.alpha.tar.gz \
-		tac_plus_radius.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The www.gazi.edu.tr tacacs+ Daemon with pam and libradius support
-
-USE_RC_SUBR=	tac_plus
-
-CONFLICTS=	ru-tac+ia-[0-9]* tac_plus-[0-9]*
-
-WRKPREFIX=	tac_plus.F5.0.0.alpha
-WRKSRC=		${WRKDIR}/${WRKPREFIX}/
-
-USE_OPENSSL=	yes
-
-ALL_TARGET=	tac_plus
-MAN1=		tac_plus.1
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/tac_plus ${PREFIX}/sbin
-	@${INSTALL_MAN} ${WRKSRC}/tac_plus.1 ${PREFIX}/man/man1/tac_plus.1
-	@${MKDIR} ${PREFIX}/etc/tac_plus
-	@${INSTALL_DATA} -m 640 ${WRKSRC}/tac_plus.cfg ${PREFIX}/etc/tac_plus/tac_plus.cfg.sample
-	@${INSTALL_DATA} -m 640 ${WRKSRC}/radius.example ${PREFIX}/etc/tac_plus/radius.cfg.sample
-
-.include <bsd.port.post.mk>
diff --git a/net/tac_plus-libradius/distinfo b/net/tac_plus-libradius/distinfo
deleted file mode 100644
index d4edf80c8c07..000000000000
--- a/net/tac_plus-libradius/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (tac_plus.F5.0.0.alpha.tar.gz) = a3a29683069480c8e3f56c514f72a650f33b8a71635c90591acea2a94906abfc
-SIZE (tac_plus.F5.0.0.alpha.tar.gz) = 177114
-SHA256 (tac_plus_radius.tgz) = 88251c541d47738284bda9ccc7f3a3c03249fe8433d43e018829d50816580de0
-SIZE (tac_plus_radius.tgz) = 3628
diff --git a/net/tac_plus-libradius/files/patch-Makefile b/net/tac_plus-libradius/files/patch-Makefile
deleted file mode 100644
index 932f60b7abc9..000000000000
--- a/net/tac_plus-libradius/files/patch-Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
---- ./Makefile.orig	2001-03-21 09:33:15.000000000 +0100
-+++ ./Makefile	2011-08-29 00:31:55.000000000 +0200
-@@ -33,9 +33,9 @@
- CPPFLAGS = 
- CFLAGS = $(CPPFLAGS) -g -O2
- LDFLAGS = 
--OSLIBS = -lldap -lldap -lc -lcrypt -lresolv -lnsl -llber -lcrypt -lc 
--DEFINES = -DUSE_LDAP 
--OS= -DLINUX -DGLIBC
-+OSLIBS = -lc -lcrypt -lcrypt -lc -I/usr/local/include -L/usr/local/lib -lradius
-+DEFINES = -DUSE_RADIUS 
-+OS= 
- # For AIX
- # See /usr/lpp/bos/bsdport on your system for details of how to define bsdcc
- # CC=bsdcc
-@@ -52,7 +52,7 @@
- #OSLIBS=-lsocket -lnsl
- 
- # For FreeBSD
--# OS=-DFREEBSD
-+OS=-DFREEBSD
- # You may also need to add:
- # OSLIBS=-lcrypt
- # NOTE: If you want your password encryption to be compatible with
-@@ -108,7 +108,8 @@
- # End of customisable section of Makefile
- #
- 
--CFLAGS = $(DEBUG) $(OPT_FLAGS) $(DEFINES) $(INCLUDES) $(FLAGS) $(OS) $(PIDFILE) $(LDFLAGS) $(DB)
-+
-+CFLAGS = $(DEBUG) $(OPT_FLAGS) $(DEFINES) $(INCLUDES) $(FLAGS) $(OS) $(PIDFILE) $(LDFLAGS) $(DB) -I/usr/local/include -L/usr/local/lib
- 
- HFILES = expire.h parse.h regmagic.h md5.h regexp.h tac_plus.h 
- 
-@@ -117,7 +118,9 @@
- 	packet.c report.c sendauth.c tac_plus.c utils.c pw.c hash.c \
- 	parse.c regexp.c programs.c enable.c pwlib.c default_fn.c \
- 	skey_fn.c default_v0_fn.c sendpass.c maxsess.c tac_pam.c \
--	db.c db_null.c db_mysql.c ldap.c
-+	db.c db_null.c db_mysql.c radius.c
-+
-+# add ldap.c and also define USE_LDAP to enable LDAP support
- 
- OBJS = $(SRCS:.c=.o)
- 
-@@ -154,7 +157,8 @@
- install:
- 	cp tac_plus ${prefix}/sbin
- 	cp tac_plus.1 ${prefix}/man/man8/tac_plus.8
--	cp tac_plus.cfg /etc
-+	cp tac_plus.cfg ${prefix}/etc/tac_plus
-+	cp radius.example ${prefix}/etc/tac_plus
- 
- depend:
- 	makedepend $(CFLAGS) $(SRCS)
diff --git a/net/tac_plus-libradius/files/patch-config.c b/net/tac_plus-libradius/files/patch-config.c
deleted file mode 100644
index 1b6ac80c03f8..000000000000
--- a/net/tac_plus-libradius/files/patch-config.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./config.c.orig	2001-03-16 10:04:27.000000000 +0100
-+++ ./config.c	2011-08-29 00:31:55.000000000 +0200
-@@ -109,7 +109,7 @@
- static int no_user_dflt = 0;	/* default if user doesn't exist */
- static char *authen_default = NULL;	/* top level authentication default */
- static int authen_default_method = 0; /*For method check */
--static char *nopasswd_str = "nopassword";
-+char *nopasswd_str = "nopassword";
- 
- /* A host definition structure. Currently unused, but when we start
-    configuring host-specific information e.g. per-host keys, this is
-@@ -603,6 +603,12 @@
- 		authen_default_method = sym_code;
- 		break;
- #endif
-+#ifdef USE_RADIUS
-+		case S_radius:
-+		fprintf(stderr,"sym_code=%i, radius\n",sym_code);
-+		authen_default_method = sym_code;
-+                break;
-+#endif
-                 
-  
- 		default:
diff --git a/net/tac_plus-libradius/files/patch-db_null.c b/net/tac_plus-libradius/files/patch-db_null.c
deleted file mode 100644
index 5f335fdb5617..000000000000
--- a/net/tac_plus-libradius/files/patch-db_null.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./db_null.c.orig	2000-12-18 17:58:02.000000000 +0100
-+++ ./db_null.c	2011-08-29 00:31:55.000000000 +0200
-@@ -48,9 +48,7 @@
- char *a_username;
- char *elapsed_time;char *bytes_in;char *bytes_out;
- {
--report(LOG_INFO,"Db accounting user=%s pass=%s host=%s 
--db_name=%s table=%s servern=%s clientn=%s username=%s et=%s bi=%s bo=%s",db_user,db_password,db_hostname,
--db_name,db_table,s_name,c_name,a_username,elapsed_time,bytes_in,bytes_out);
-+report(LOG_INFO,"Db accounting user=%s pass=%s host=%s db_name=%s table=%s servern=%s clientn=%s username=%s et=%s bi=%s bo=%s",db_user,db_password,db_hostname, db_name,db_table,s_name,c_name,a_username,elapsed_time,bytes_in,bytes_out);
- return (1);
- }
- #endif
diff --git a/net/tac_plus-libradius/files/patch-do_acct.c b/net/tac_plus-libradius/files/patch-do_acct.c
deleted file mode 100644
index ffa659850d93..000000000000
--- a/net/tac_plus-libradius/files/patch-do_acct.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- ./do_acct.c.orig	2000-12-18 17:58:02.000000000 +0100
-+++ ./do_acct.c	2011-08-29 00:31:55.000000000 +0200
-@@ -21,6 +21,13 @@
- 
- static int acctfd = 0;
- 
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 900007
-+# define utmp utmpx
-+# define ut_time ut_tv.tv_sec
-+# define ut_name ut_user
-+#endif
-+
-+
- /* Make a acct entry into the accounting file for accounting. 
-    Return 1 on error  */
- 
-@@ -159,7 +166,7 @@
- #endif
-     entry.ut_time = utime;
- 
--    wtmpfd = open(wtmpfile, O_CREAT | O_WRONLY | O_APPEND | O_SYNC, 0644);	
-+    wtmpfd = open(wtmpfile, O_CREAT | O_WRONLY | O_APPEND , 0644);	
-     if (wtmpfd < 0) {
- 	report(LOG_ERR, "Can't open wtmp file %s -- %s",
- 	       wtmpfile, sys_errlist[errno]);
diff --git a/net/tac_plus-libradius/files/patch-parse.c b/net/tac_plus-libradius/files/patch-parse.c
deleted file mode 100644
index e48bfe1218d6..000000000000
--- a/net/tac_plus-libradius/files/patch-parse.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./parse.c.orig	2001-03-16 09:14:21.000000000 +0100
-+++ ./parse.c	2011-08-29 00:31:55.000000000 +0200
-@@ -99,6 +99,9 @@
- #ifdef USE_LDAP
-     declare ("ldap", S_ldap);
- #endif
-+#ifdef USE_RADIUS
-+    declare ("radius",S_radius);
-+#endif
-     declare("member", S_member);
-     declare("message", S_message);
-     declare("name", S_name);
-@@ -178,6 +181,10 @@
-     case S_ldap:
-       return ("ldap");
- #endif
-+#ifdef USE_RADIUS
-+    case S_radius:
-+      return ("radius");
-+#endif
-    case S_expires:
- 	return ("expires");
-     case S_after:
diff --git a/net/tac_plus-libradius/files/patch-parse.h b/net/tac_plus-libradius/files/patch-parse.h
deleted file mode 100644
index c179972d6dbe..000000000000
--- a/net/tac_plus-libradius/files/patch-parse.h
+++ /dev/null
@@ -1,9 +0,0 @@
---- ./parse.h.orig	2001-03-16 09:18:44.000000000 +0100
-+++ ./parse.h	2011-08-29 00:31:55.000000000 +0200
-@@ -85,3 +85,6 @@
- #ifdef USE_LDAP
- #define S_ldap            46
- #endif /* LDAP */
-+#ifdef USE_RADIUS
-+#define S_radius	  47
-+#endif /* radius */
diff --git a/net/tac_plus-libradius/files/patch-pwlib.c b/net/tac_plus-libradius/files/patch-pwlib.c
deleted file mode 100644
index eb5bc3389cba..000000000000
--- a/net/tac_plus-libradius/files/patch-pwlib.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./pwlib.c.orig	2001-03-16 14:42:54.000000000 +0100
-+++ ./pwlib.c	2011-08-29 00:31:55.000000000 +0200
-@@ -40,6 +40,10 @@
- #include "ldap.h"
- #endif /* LDAP */
- 
-+#ifdef USE_RADIUS
-+#include "radius.h"
-+#endif
-+
- /* Generic password verification routines for des, file and cleartext
-    passwords */
- 
-@@ -177,6 +181,20 @@
-         break; 
- #endif
- 
-+#ifdef USE_RADIUS
-+	case (S_radius):
-+	if (radius_verify(name,passwd,file)==1) {
-+            data->status = TAC_PLUS_AUTHEN_STATUS_FAIL;
-+            return (0);
-+        } else {
-+            data->status = TAC_PLUS_AUTHEN_STATUS_PASS;
-+        }
-+        exp_date = NULL;
-+        set_expiration_status(exp_date, data);
-+        return (data->status == TAC_PLUS_AUTHEN_STATUS_PASS);	 
-+        break; 
-+#endif
-+
- 
- #ifdef USE_PAM
-         case (S_pam):
diff --git a/net/tac_plus-libradius/files/patch-tac_plus.h b/net/tac_plus-libradius/files/patch-tac_plus.h
deleted file mode 100644
index a675cce6a708..000000000000
--- a/net/tac_plus-libradius/files/patch-tac_plus.h
+++ /dev/null
@@ -1,40 +0,0 @@
---- ./tac_plus.h.orig	2000-12-18 17:58:02.000000000 +0100
-+++ ./tac_plus.h	2011-08-29 00:31:55.000000000 +0200
-@@ -70,7 +70,7 @@
-  */
- /* #define REARMSIGNAL */
- 
--#define VERSION "F4.0.3.alpha.v7(DB&PAM support)"
-+#define VERSION "F4.0.3.alpha.v7(DB,PAM&libradius support - incl. mmersbers patches!)"
- 
- /*
-  * System definitions. 
-@@ -154,6 +154,7 @@
- #endif /* MSCHAP */
- 
- #include <string.h>
-+#include <sys/param.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-@@ -172,7 +173,11 @@
- #include <sys/syslog.h>
- #endif
- 
-+#if __FreeBSD_version >= 900007
-+#include <utmpx.h>
-+#else
- #include <utmp.h>
-+#endif
- 
- #include <unistd.h>
- 
-@@ -681,7 +686,7 @@
- extern char *cfg_get_global_secret();
- #ifdef USE_PAM
- extern char *cfg_get_pam_service();
--#endif / *PAM */ 
-+#endif /* PAM */ 
- extern void cfg_clean_config();
- extern char *cfg_nodestring();
- 
diff --git a/net/tac_plus-libradius/files/tac_plus.in b/net/tac_plus-libradius/files/tac_plus.in
deleted file mode 100644
index 9001382dab53..000000000000
--- a/net/tac_plus-libradius/files/tac_plus.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: tac_plus
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Define these tac_plus_* variables in
-#   /etc/rc.conf        or
-#   /etc/rc.conf.local
-#
-# tac_plus_enabe="YES"
-# tac_plus_cfg="%%PREFIX%%/etc/tac_plus/tac_plus.cfg"
-# tac_plus_flags="-d 1" # see man (1) tac_plus
-#
-
-. /etc/rc.subr
-
-name="tac_plus"
-rcvar=tac_plus_enable
-
-command=%%PREFIX%%/sbin/tac_plus
-pidfile=/var/run/tac_plus.pid
-tac_plus_enable=${tac_plus_enable:-"NO"}
-tac_plus_flags=${tac_plus_flags:-"-d 1"}
-tac_plus_configfile=${tac_plus_configfile:-"%%PREFIX%%/etc/tac_plus/tac_plus.cfg"}
-
-load_rc_config $name
-
-required_files=${tac_plus_configfile}
-tac_plus_flags="-C ${tac_plus_configfile} ${tac_plus_flags}"
-
-run_rc_command "$1"
diff --git a/net/tac_plus-libradius/pkg-descr b/net/tac_plus-libradius/pkg-descr
deleted file mode 100644
index b51fbce7fd78..000000000000
--- a/net/tac_plus-libradius/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-tacacs+ s program that allow authorization and authentication via net on
-remote access servers. Authenticate users, authorize commands and log 
-accounting information.
-
-This version is includes a patch to include limited libradius support which
-allows to forward authentication requests to a radius server.
-
-WWW: http://www.portal-to-web.de/tacacs/
diff --git a/net/tac_plus-libradius/pkg-plist b/net/tac_plus-libradius/pkg-plist
deleted file mode 100644
index 7378923f757f..000000000000
--- a/net/tac_plus-libradius/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/tac_plus/radius.cfg.sample
-etc/tac_plus/tac_plus.cfg.sample
-sbin/tac_plus
-@dirrmtry etc/tac_plus
diff --git a/net/tcptraceroute-devel/Makefile b/net/tcptraceroute-devel/Makefile
deleted file mode 100644
index 162d1df74231..000000000000
--- a/net/tcptraceroute-devel/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Created by: josh.carroll@gmail.com
-# $FreeBSD$
-
-PORTNAME=	tcptraceroute
-DISTVERSION=	1.5beta7
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	http://michael.toren.net/code/tcptraceroute/ \
-		http://pflog.net/tcptraceroute/
-PKGNAMESUFFIX=	-devel
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Traceroute implementation using TCP packets
-
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
-
-CONFLICTS=	tcptraceroute-1.4*
-
-USES=		gmake
-GNU_CONFIGURE=	yes
-
-MAN1=	tcptraceroute.1
-
-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
-
-CONFIGURE_ARGS=		--with-libpcap=/usr --bindir=${PREFIX}/sbin
-
-INSTALL_TARGET=	install-exec-am install-man
-
-NO_STAGE=	yes
-post-install:
-	@${CHMOD} u+s ${PREFIX}/sbin/tcptraceroute
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/tcptraceroute.1.html ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/tcptraceroute.lsm ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/AUTHORS ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/COPYING ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/ChangeLog ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/NEWS ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/examples.txt ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/tcptraceroute-devel/distinfo b/net/tcptraceroute-devel/distinfo
deleted file mode 100644
index a54bf38cd78d..000000000000
--- a/net/tcptraceroute-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (tcptraceroute-1.5beta7.tar.gz) = aed5b163ed4886f04242b46005a6cb4876ef38ad72001a94facb62a99dc99c57
-SIZE (tcptraceroute-1.5beta7.tar.gz) = 119119
diff --git a/net/tcptraceroute-devel/files/patch-configure b/net/tcptraceroute-devel/files/patch-configure
deleted file mode 100644
index 9fe536ac4aa0..000000000000
--- a/net/tcptraceroute-devel/files/patch-configure
+++ /dev/null
@@ -1,46 +0,0 @@
---- configure.old	2006-03-28 20:49:55.000000000 -0500
-+++ configure	2007-12-13 13:57:42.000000000 -0500
-@@ -3713,38 +3713,11 @@
- 
- fi;
- 
--LIBNET_CONFIG="libnet-config"	# relative, using $PATH
--
--# Check whether --with-libnet or --without-libnet was given.
--if test "${with_libnet+set}" = set; then
--  withval="$with_libnet"
--
--		LIBNETCC=""
--		LIBNETLD=""
--
--		test -x "$withval/bin/libnet-config" &&	LIBNET_CONFIG="$withval/bin/libnet-config"
--		test -x "$withval/libnet-config"	 &&	LIBNET_CONFIG="$withval/libnet-config"
--
--		test -f "$withval/libnet.h"			&&	LIBNETCC="$LIBNETCC -I$withval"
--		test -f "$withval/include/libnet.h"	&&	LIBNETCC="$LIBNETCC -I$withval/include"
--
--		test -f "$withval/libnet.a"			&&	LIBNETLD="$LIBNETLD -L$withval"
--		test -f "$withval/lib/libnet.a"		&&	LIBNETLD="$LIBNETLD -L$withval/lib"
--
--		if test -z "$LIBNETCC" -o -z "$LIBNETLD"
--		then
--			{ { echo "$as_me:$LINENO: error: No valid libnet library found in $withval" >&5
--echo "$as_me: error: No valid libnet library found in $withval" >&2;}
--   { (exit 1); exit 1; }; }
--		else
--			CPPFLAGS="$CPPFLAGS $LIBNETCC"
--			LDFLAGS="$LDFLAGS $LIBNETLD"
--			{ echo "$as_me:$LINENO: using libnet in $withval" >&5
--echo "$as_me: using libnet in $withval" >&6;}
--		fi
--
--fi;
--
-+LIBNET_CONFIG="libnet11-config"	# relative, using $PATH
-+LIBNETCC=`$LIBNET_CONFIG --cflags`
-+LIBNETLD=`$LIBNET_CONFIG --libs`
-+CPPFLAGS="$CPPFLAGS $LIBNETCC"
-+LDFLAGS="$LDFLAGS $LIBNETLD"
- 
- echo "$as_me:$LINENO: checking for pcap_open_live in -lpcap" >&5
- echo $ECHO_N "checking for pcap_open_live in -lpcap... $ECHO_C" >&6
diff --git a/net/tcptraceroute-devel/pkg-descr b/net/tcptraceroute-devel/pkg-descr
deleted file mode 100644
index 35920dc8ed50..000000000000
--- a/net/tcptraceroute-devel/pkg-descr
+++ /dev/null
@@ -1,18 +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/
diff --git a/net/tcptraceroute-devel/pkg-plist b/net/tcptraceroute-devel/pkg-plist
deleted file mode 100644
index 7e278be821d7..000000000000
--- a/net/tcptraceroute-devel/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-sbin/tcptraceroute
-%%PORTDOCS%%%%DOCSDIR%%/tcptraceroute.1.html
-%%PORTDOCS%%%%DOCSDIR%%/tcptraceroute.lsm
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/examples.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/ushare/Makefile b/net/ushare/Makefile
deleted file mode 100644
index f09a52b896f1..000000000000
--- a/net/ushare/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Created by: Volker Theile <votdev@gmx.de>
-# $FreeBSD$
-
-PORTNAME=	ushare
-PORTVERSION=	1.1a
-PORTREVISION=	10
-CATEGORIES=	net
-MASTER_SITES=	http://ushare.geexbox.org/releases/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Lightweight UPnP (TM) A/V Media Server
-
-LIB_DEPENDS=	libupnp.so:${PORTSDIR}/devel/upnp
-
-HAS_CONFIGURE=	yes
-USES=		gettext gmake pkgconfig tar:bzip2
-LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-
-CFLAGS+=	-I${LOCALBASE}/include -I${WRKSRC}
-
-MAN1=		${PORTNAME}.1
-
-OPTION_DEFINE=	LIBDLNA
-LIBDLNA_DESC=	DLNA (PS3) support
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLIBDLNA}
-LIB_DEPENDS+=	libdlna.so:${PORTSDIR}/devel/libdlna
-CONFIGURE_ARGS=	--enable-dlna
-.endif
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin
-	${CP} ${WRKSRC}/scripts/${PORTNAME}.conf \
-		${PREFIX}/etc/${PORTNAME}.conf.sample
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/${PORTNAME} ${PREFIX}/etc/rc.d
-	${INSTALL_MAN} ${WRKSRC}/src/${PORTNAME}.1 ${PREFIX}/man/man1
-
-post-install:
-	${CP} -np ${PREFIX}/etc/${PORTNAME}.conf.sample \
-		${PREFIX}/etc/${PORTNAME}.conf || ${TRUE}
-
-.include <bsd.port.mk>
diff --git a/net/ushare/distinfo b/net/ushare/distinfo
deleted file mode 100644
index 185d787da690..000000000000
--- a/net/ushare/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ushare-1.1a.tar.bz2) = 7b9b85c79968d4f4560f02a99e33c6a33ff58f9d41d8faea79e31cce2ee78665
-SIZE (ushare-1.1a.tar.bz2) = 65864
diff --git a/net/ushare/files/patch-ushare b/net/ushare/files/patch-ushare
deleted file mode 100644
index 1967b2f9291a..000000000000
--- a/net/ushare/files/patch-ushare
+++ /dev/null
@@ -1,111 +0,0 @@
---- scripts/ushare.orig	2008-10-13 13:23:21.000000000 +0800
-+++ scripts/ushare	2008-10-13 13:24:47.000000000 +0800
-@@ -1,82 +1,29 @@
--#!/bin/sh -e
-+#!/bin/sh
- #
--# uShare init script
-+# ushare.sh for rc.d usage (c) 2007 Volker Theile <votdev@gmx.de>.
- #
--### BEGIN INIT INFO
--# Provides:          ushare
--# Required-Start:    $local_fs $syslog $network
--# Should-Start:
--# Required-Stop:
--# Should-Stop:
--# Default-Start:     2 3 4 5
--# Default-Stop:      0 1 6
--# Short-Description: uShare
--# Description:       uShare UPnP (TM) A/V & DLNA Media Server
--#                    You should edit configuration in /etc/ushare.conf file
--#                    See http://ushare.geexbox.org for details
--### END INIT INFO
--
--PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
--DAEMON=/usr/bin/ushare
--NAME=ushare
--DESC="uShare UPnP A/V & DLNA Media Server"
--PIDFILE=/var/run/ushare.pid
--CONFIGFILE=/etc/ushare.conf
--
--# abort if no executable exists
--[ -x $DAEMON ] || exit 0
--
--# Get lsb functions
--. /lib/lsb/init-functions
--. /etc/default/rcS
--
--[ -f /etc/default/ushare ] && . /etc/default/ushare
--
--checkpid() {
--  [ -e $PIDFILE ] || touch $PIDFILE
--}
--
--check_shares() {
--  if [ -r "$CONFIGFILE" ]; then
--    . $CONFIGFILE
--    [ -n "$USHARE_DIR" ] && return 0
--  fi
--  return 1
--}
--
--case "$1" in
--  start)
--    log_daemon_msg "Starting $DESC: $NAME"
--    if ! $(check_shares); then
--      log_warning_msg "No shares avalaible ..."
--      log_end_msg 0
--    else
--      checkpid
--      start-stop-daemon --start --quiet --background --oknodo \
--        --make-pidfile --pidfile $PIDFILE \
--        --exec $DAEMON -- $USHARE_OPTIONS
--      log_end_msg $?
--    fi
--  ;;
--  stop)
--    log_daemon_msg "Stopping $DESC: $NAME"
--    start-stop-daemon --stop --signal 2 --quiet --oknodo --pidfile $PIDFILE
--    log_end_msg $?
--  ;;
--  reload|force-reload)
--    log_daemon_msg "Reloading $DESC: $NAME"
--    start-stop-daemon --stop --signal 1 --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON
--    log_end_msg $?
--  ;;
--  restart)
--    $0 stop
--    $0 start
--  ;;
--  *)
--    N=/etc/init.d/$NAME
--    log_success_msg "Usage: $N {start|stop|restart|reload|force-reload}"
--    exit 1
--  ;;
--esac
- 
--exit 0
-+# PROVIDE: ushare
-+# REQUIRE: DAEMON
-+# BEFORE: LOGIN
-+# KEYWORD: shutdown
-+
-+# Add the following line to /etc/rc.conf to enable `ushare':
-+#
-+#ushare_enable="YES"
-+
-+. /etc/rc.subr
-+
-+name=ushare
-+rcvar=ushare_enable
-+
-+command="/usr/local/bin/$name"
-+command_args="--daemon"
-+required_files="/usr/local/etc/$name.conf"
-+
-+# read configuration and set defaults
-+load_rc_config "$name"
-+: ${ushare_enable="NO"}
-+: ${ushare_flags=""}
-+ 
-+run_rc_command "$1"
diff --git a/net/ushare/files/patch-ushare.c b/net/ushare/files/patch-ushare.c
deleted file mode 100644
index d5959c0af17d..000000000000
--- a/net/ushare/files/patch-ushare.c
+++ /dev/null
@@ -1,118 +0,0 @@
---- src/ushare.c.orig	2007-12-09 15:03:36.000000000 +0200
-+++ src/ushare.c	2010-11-09 14:56:44.261445831 +0200
-@@ -171,6 +171,19 @@
-   pthread_mutex_unlock (&ut->termination_mutex);
- }
- 
-+
-+#ifdef __FreeBSD__
-+static void
-+*get_ip_addr(struct sockaddr *sa)
-+{
-+  if (sa->sa_family == AF_INET)
-+    return &(((struct sockaddr_in*)sa)->sin_addr);
-+  else
-+    return &(((struct sockaddr_in6*)sa)->sin6_addr);
-+}
-+#endif /* __FreeBSD__ */
-+
-+
- static void
- handle_action_request (struct Upnp_Action_Request *request)
- {
-@@ -188,7 +201,11 @@
-   if (strcmp (request->DevUDN + 5, ut->udn))
-     return;
- 
-+#ifndef __FreeBSD__
-   ip = request->CtrlPtIPAddr.s_addr;
-+#else
-+  ip = get_ip_addr((struct sockaddr *)&request->CtrlPtIPAddr) ;
-+#endif /* __FreeBSD__ */
-   ip = ntohl (ip);
-   sprintf (val, "%d.%d.%d.%d",
-            (ip >> 24) & 0xFF, (ip >> 16) & 0xFF, (ip >> 8) & 0xFF, ip & 0xFF);
-@@ -348,6 +365,7 @@
- 
-   UpnpEnableWebserver (TRUE);
- 
-+#ifndef __FreeBSD__
-   res = UpnpSetVirtualDirCallbacks (&virtual_dir_callbacks);
-   if (res != UPNP_E_SUCCESS)
-   {
-@@ -355,6 +373,43 @@
-     free (description);
-     return -1;
-   }
-+#else
-+  if ((res = UpnpVirtualDir_set_GetInfoCallback(virtual_dir_callbacks.get_info)) != UPNP_E_SUCCESS ) {
-+     log_error (_("Cannot set virtual directory callback - get_info\n"));
-+     free (description);
-+     return -1;
-+  }
-+
-+  if ((res = UpnpVirtualDir_set_OpenCallback(virtual_dir_callbacks.open)) != UPNP_E_SUCCESS ) {
-+     log_error (_("Cannot set virtual directory callback - open\n"));
-+     free (description);
-+     return -1;
-+  }
-+
-+  if ((res = UpnpVirtualDir_set_ReadCallback(virtual_dir_callbacks.read)) != UPNP_E_SUCCESS ) {
-+     log_error (_("Cannot set virtual directory callback - read\n"));
-+     free (description);
-+     return -1;
-+  }
-+
-+  if ((res = UpnpVirtualDir_set_WriteCallback(virtual_dir_callbacks.write)) != UPNP_E_SUCCESS ) {
-+     log_error (_("Cannot set virtual directory callback - write\n"));
-+     free (description);
-+     return -1;
-+  }
-+
-+  if ((res = UpnpVirtualDir_set_SeekCallback(virtual_dir_callbacks.seek)) != UPNP_E_SUCCESS ) {
-+     log_error (_("Cannot set virtual directory callback - seek\n"));
-+     free (description);
-+     return -1;
-+  }
-+
-+  if ((res = UpnpVirtualDir_set_CloseCallback(virtual_dir_callbacks.close)) != UPNP_E_SUCCESS ) {
-+     log_error (_("Cannot set virtual directory callback - close\n"));
-+     free (description);
-+     return -1;
-+  }
-+#endif /* __FreeBSD__ */
- 
-   res = UpnpAddVirtualDir (VIRTUAL_DIR);
-   if (res != UPNP_E_SUCCESS)
-@@ -421,6 +476,7 @@
-   itf = itflist;
-   while (itf)
-   {
-+#ifndef __FreeBSD__
-     if ((itf->ifa_flags & IFF_UP)
-         && !strncmp (itf->ifa_name, interface, IFNAMSIZ))
-     {
-@@ -430,6 +486,23 @@
-       return true;
-     }
-     itf = itf->ifa_next;
-+#else
-+    if (strncmp (itf->ifa_name, interface, IFNAMSIZ)) {
-+       itf = itf->ifa_next;
-+       continue ;
-+    }
-+
-+    if (itf->ifa_flags & IFF_UP) {
-+       log_info (_("Interface %s is up.\n"), interface);
-+       freeifaddrs (itflist);
-+       return true ;
-+    } else {
-+         log_error (_("Interface %s is down.\n"), interface);
-+         log_error (_("Recheck uShare's configuration and try again !\n"));
-+         freeifaddrs (itflist);
-+         return false ;
-+      }
-+#endif /*  __FreeBSD__ */
-   }
- 
-   freeifaddrs (itf);
diff --git a/net/ushare/files/patch-ushare.h b/net/ushare/files/patch-ushare.h
deleted file mode 100644
index 35619ebe428a..000000000000
--- a/net/ushare/files/patch-ushare.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/ushare.h.orig	2007-12-09 15:03:36.000000000 +0200
-+++ src/ushare.h	2010-11-09 14:31:03.466292203 +0200
-@@ -27,6 +27,11 @@
- #include <stdbool.h>
- #include <pthread.h>
- 
-+#ifdef __FreeBSD__
-+#include <stdio.h>
-+#include <string.h>
-+#endif /* __FreeBSD__ */
-+
- #ifdef HAVE_DLNA
- #include <dlna.h>
- #endif /* HAVE_DLNA */
diff --git a/net/ushare/pkg-descr b/net/ushare/pkg-descr
deleted file mode 100644
index 0004a07f9b6e..000000000000
--- a/net/ushare/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-GeeXboX uShare is a UPnP (TM) A/V Media Server. It implements the server
-component that provides UPnP media devices with information on available
-multimedia files. uShare uses the built-in http server of libupnp to stream
-the files to clients.
-
-WWW: http://ushare.geexbox.org/
diff --git a/net/ushare/pkg-plist b/net/ushare/pkg-plist
deleted file mode 100644
index c15e74470633..000000000000
--- a/net/ushare/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/ushare
-etc/rc.d/ushare
-@unexec cmp -s %D/etc/ushare.conf.sample %D/etc/ushare.conf && rm %D/etc/ushare.conf || true
-etc/ushare.conf.sample
-@exec cp -np %D/%F %B/ushare.conf
diff --git a/net/v6eval/Makefile b/net/v6eval/Makefile
deleted file mode 100644
index 8c8939bfafb3..000000000000
--- a/net/v6eval/Makefile
+++ /dev/null
@@ -1,195 +0,0 @@
-# Created by: TANAKA Takashi <tanaka@tahi.org>
-# $FreeBSD$
-
-PORTNAME=	v6eval
-PORTVERSION=	3.3.2
-PORTREVISION=	2
-PORTEPOCH=	1
-CATEGORIES=	net ipv6
-MASTER_SITES=	http://www.tahi.org/release/v6eval/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	IPv6 Conformance Test Platform
-
-LICENSE=	BSD
-LICENSE_FILE=	${WRKSRC}/COPYRIGHT
-
-RUN_DEPENDS=	p5-Expect>=0:${PORTSDIR}/lang/p5-Expect \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
-
-USE_OPENSSL=	yes
-USES=	shebangfix perl5
-SHEBANG_FILES=	\
-	bin/autorun/autorun.pl \
-	bin/indexgen/indexgen.pl \
-	bin/pktbuf/pktbuf.pl \
-	bin/pktctl/pktctl.pl \
-	bin/pktlint/pktlint.pl \
-	bin/pktrecv/pktrecv.pl \
-	bin/pktsend/pktsend.pl \
-	bin/remotes/manual/cleardefr.rmt \
-	bin/remotes/manual/clearmtu.rmt \
-	bin/remotes/manual/clearnc.rmt \
-	bin/remotes/manual/clearprefix.rmt \
-	bin/remotes/manual/clearroute.rmt \
-	bin/remotes/manual/dhcp6c.rmt \
-	bin/remotes/manual/dhcp6r.rmt \
-	bin/remotes/manual/dhcp6s.rmt \
-	bin/remotes/manual/igmpv3.rmt \
-	bin/remotes/manual/igmpv3config.rmt \
-	bin/remotes/manual/ikeClearAll.rmt \
-	bin/remotes/manual/ikeConfig.rmt \
-	bin/remotes/manual/ikeDump.rmt \
-	bin/remotes/manual/ikeEnable.rmt \
-	bin/remotes/manual/ikeInitiate.rmt \
-	bin/remotes/manual/ikeResetSA.rmt \
-	bin/remotes/manual/ikeSetSA.rmt \
-	bin/remotes/manual/ikeStart.rmt \
-	bin/remotes/manual/ikeStop.rmt \
-	bin/remotes/manual/ikeTunnel.rmt \
-	bin/remotes/manual/ipsecClearAll.rmt \
-	bin/remotes/manual/ipsecEnable.rmt \
-	bin/remotes/manual/ipsecResetSPD.rmt \
-	bin/remotes/manual/ipsecSetSAD.rmt \
-	bin/remotes/manual/ipsecSetSPD.rmt \
-	bin/remotes/manual/loginout.rmt \
-	bin/remotes/manual/manualaddrconf.rmt \
-	bin/remotes/manual/mip6EnableCN.rmt \
-	bin/remotes/manual/mip6EnableHA.rmt \
-	bin/remotes/manual/mip6EnableMN.rmt \
-	bin/remotes/manual/mldv2.rmt \
-	bin/remotes/manual/mldv2DisableHUT.rmt \
-	bin/remotes/manual/mldv2DisableRUT.rmt \
-	bin/remotes/manual/mldv2EnableHUT.rmt \
-	bin/remotes/manual/mldv2EnableRUT.rmt \
-	bin/remotes/manual/mldv2ListenerAPI.rmt \
-	bin/remotes/manual/mldv2SetHUT.rmt \
-	bin/remotes/manual/mldv2SetRUT.rmt \
-	bin/remotes/manual/mldv2config.rmt \
-	bin/remotes/manual/mtuconfig.rmt \
-	bin/remotes/manual/multicastConfig.rmt \
-	bin/remotes/manual/natpt.rmt \
-	bin/remotes/manual/pim6dd.rmt \
-	bin/remotes/manual/ping6.rmt \
-	bin/remotes/manual/racontrol.rmt \
-	bin/remotes/manual/reboot.rmt \
-	bin/remotes/manual/reboot_async.rmt \
-	bin/remotes/manual/ripng_start.rmt \
-	bin/remotes/manual/ripng_stop.rmt \
-	bin/remotes/manual/route.rmt \
-	bin/remotes/manual/rtadvd.rmt \
-	bin/remotes/manual/setDNS.rmt \
-	bin/remotes/manual/showAddr.rmt \
-	bin/remotes/manual/sysctl.rmt \
-	bin/remotes/manual/tcp6.rmt \
-	bin/remotes/manual/tunnel.rmt \
-	bin/remotes/manual/useTempAddr.rmt \
-	bin/remotes/unknown/cleardefr.rmt \
-	bin/remotes/unknown/clearmtu.rmt \
-	bin/remotes/unknown/clearnc.rmt \
-	bin/remotes/unknown/clearprefix.rmt \
-	bin/remotes/unknown/clearroute.rmt \
-	bin/remotes/unknown/dhcp6c.rmt \
-	bin/remotes/unknown/dhcp6r.rmt \
-	bin/remotes/unknown/dhcp6s.rmt \
-	bin/remotes/unknown/igmpv3.rmt \
-	bin/remotes/unknown/igmpv3config.rmt \
-	bin/remotes/unknown/ikeClearAll.rmt \
-	bin/remotes/unknown/ikeConfig.rmt \
-	bin/remotes/unknown/ikeDump.rmt \
-	bin/remotes/unknown/ikeEnable.rmt \
-	bin/remotes/unknown/ikeInitiate.rmt \
-	bin/remotes/unknown/ikeResetSA.rmt \
-	bin/remotes/unknown/ikeSetSA.rmt \
-	bin/remotes/unknown/ikeStart.rmt \
-	bin/remotes/unknown/ikeStop.rmt \
-	bin/remotes/unknown/ikeTunnel.rmt \
-	bin/remotes/unknown/ipsecClearAll.rmt \
-	bin/remotes/unknown/ipsecEnable.rmt \
-	bin/remotes/unknown/ipsecResetSPD.rmt \
-	bin/remotes/unknown/ipsecSetSAD.rmt \
-	bin/remotes/unknown/ipsecSetSPD.rmt \
-	bin/remotes/unknown/loginout.rmt \
-	bin/remotes/unknown/manualaddrconf.rmt \
-	bin/remotes/unknown/mip6EnableCN.rmt \
-	bin/remotes/unknown/mip6EnableHA.rmt \
-	bin/remotes/unknown/mip6EnableMN.rmt \
-	bin/remotes/unknown/mldv2.rmt \
-	bin/remotes/unknown/mldv2config.rmt \
-	bin/remotes/unknown/mtuconfig.rmt \
-	bin/remotes/unknown/multicastConfig.rmt \
-	bin/remotes/unknown/natpt.rmt \
-	bin/remotes/unknown/pim6dd.rmt \
-	bin/remotes/unknown/ping6.rmt \
-	bin/remotes/unknown/racontrol.rmt \
-	bin/remotes/unknown/reboot.rmt \
-	bin/remotes/unknown/ripng_start.rmt \
-	bin/remotes/unknown/ripng_stop.rmt \
-	bin/remotes/unknown/reboot_async.rmt \
-	bin/remotes/unknown/route.rmt \
-	bin/remotes/unknown/rtadvd.rmt \
-	bin/remotes/unknown/setDNS.rmt \
-	bin/remotes/unknown/showAddr.rmt \
-	bin/remotes/unknown/sysctl.rmt \
-	bin/remotes/unknown/tcp6.rmt \
-	bin/remotes/unknown/tunnel.rmt \
-	bin/remotes/unknown/useTempAddr.rmt \
-	sample/64tunnel_ll_ping/ping.seq \
-	sample/HBHoptAfterDstOpt/HBHoptAfterDstOpt.seq \
-	sample/jumbo/jumbo.seq \
-	sample/mld-general/mld-general.seq \
-	sample/na_w_mtu/na_w_mtu.seq \
-	sample/ping/ping.seq \
-	sample/ping4/ping4.seq \
-	sample/ping_frag/ping_frag.seq \
-	sample/ping_from_many_host/ping.seq \
-	sample/ping_glosite/ping_glosite.seq \
-	sample/ping_w_ah/ping.seq \
-	sample/ping_w_ahesp/ping.seq \
-	sample/ping_w_esp/ping.seq \
-	sample/ping_w_espicv/ping.seq \
-	sample/ping_w_espicvespicv/ping.seq \
-	sample/portunreach/portunreach.seq \
-	sample/redirect/redirect.seq \
-	sample/timeexceeded/timeexceeded.seq \
-	sample/udpecho/udpecho.seq \
-	sample/unknownnext/unknownnext.seq \
-	sample_stddef/SendRecv/Recv.seq \
-	sample_stddef/SendRecv/Send.seq \
-	sample_stddef/aes-ctr/aes-ctr.seq \
-	sample_stddef/igmp/igmpv3_test.seq \
-	sample_stddef/mldv2/mldv2_test.seq \
-	sample_stddef/ping_frag/ping_frag.seq \
-	sample_stddef/ping_glosite/ping_glosite.seq \
-	sample_stddef/snmp/snmp.seq \
-	sample_stddef/tcp_handshake/tcp_handshake.seq \
-	script/pmod/V6evalRemote/sample/reboot.rmt \
-	script/pmod/V6evalRemote/sample/ls.rmt \
-	script/pmod/V6evalRemote/sample/reboot_async.rmt \
-	script/pmod/V6evalRemote/V6evalRemote.pm \
-	script/pmod/V6evalTool/V6evalTool.pm
-MAKE_ENV=	PREFIX="${PREFIX}" \
-		BSD_INSTALL_DATA="${BSD_INSTALL_DATA}" \
-		BSD_INSTALL_SCRIPT="${BSD_INSTALL_SCRIPT}"
-SUB_FILES=	pkg-message
-
-NO_MANCOMPRESS=	yes
-MAN1PREFIX=	${PREFIX}/v6eval
-MAN3PREFIX=	${LOCALBASE}/lib/perl5/${PERL_VER}
-MAN1=		pktctl.1.gz pktsend.1.gz
-MAN3=		V6evalRemote.3 V6evalTool.3
-
-NO_STAGE=	yes
-post-patch:
-	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
-		${WRKSRC}/script/pmod/V6evalCommon/V6evalCommon.pm
-
-post-install:
-	${FIND} ${WRKSRC}/sample ${WRKSRC}/sample_stddef \
-	    -name "*.orig" -a -exec ${RM} -f "{}" \;
-	cd ${WRKSRC} && ${COPYTREE_SHARE} sample ${PREFIX}/v6eval
-	cd ${WRKSRC} && ${COPYTREE_SHARE} sample_stddef ${PREFIX}/v6eval
-	cd ${PREFIX}/v6eval && ${CHMOD} +x ${SHEBANG_FILES:Msample*}
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/net/v6eval/distinfo b/net/v6eval/distinfo
deleted file mode 100644
index 3be6cc2acc79..000000000000
--- a/net/v6eval/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (v6eval-3.3.2.tar.gz) = bb9ba46631917c2b95d490c4248238145d6df743dfadbb3862daa68e7fb712f4
-SIZE (v6eval-3.3.2.tar.gz) = 426871
diff --git a/net/v6eval/files/patch-Makefile b/net/v6eval/files/patch-Makefile
deleted file mode 100644
index 96ea06028b79..000000000000
--- a/net/v6eval/files/patch-Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.orig	2005-05-25 11:46:16.000000000 +0900
-+++ Makefile	2013-06-17 02:10:06.000000000 +0900
-@@ -1,24 +1,26 @@
- SUBDIR=lib bin etc script include
--PREFIX= /usr/local/v6eval
-+PREFIX?=	/usr/local
- DOCFILES=00README INSTALL CHANGELOG \
--	 00README.v6eval INSTALL.v6eval CHANGELOG.v6eval \
--	 COPYRIGHT
-+	 00README.v6eval INSTALL.v6eval CHANGELOG.v6eval INSTALL.dummies
- 
--DIRS=   $(PREFIX) $(PREFIX)/bin $(PREFIX)/man $(PREFIX)/doc
-+DIRS=   $(PREFIX)/v6eval \
-+	$(PREFIX)/v6eval/bin \
-+	$(PREFIX)/v6eval/man \
-+	$(PREFIX)/v6eval/doc
- #SECTIONS=       1 2 3 4 5 6 7 8 9 n
- SECTIONS=       1
- .MAIN: depend all
- beforeinstall:
- 	for i in $(DIRS); do \
--		[ -d $$i ] || mkdir $$i; \
-+		[ -d $$i ] || install -d -m 555 $$i; \
- 	done
- #	for i in $(SECTIONS); do \
--#		[ -d $(PREFIX)/man/man$$i ] || mkdir $(PREFIX)/man/man$$i; \
--#		[ -d $(PREFIX)/man/cat$$i ] || mkdir $(PREFIX)/man/cat$$i; \
-+#		[ -d $(PREFIX)/v6eval/man/man$$i ] || mkdir $(PREFIX)/v6eval/man/man$$i; \
-+#		[ -d $(PREFIX)/v6eval/man/cat$$i ] || mkdir $(PREFIX)/v6eval/man/cat$$i; \
- #	done
- 	for i in $(SECTIONS); do \
--		[ -d $(PREFIX)/man/man$$i ] || mkdir $(PREFIX)/man/man$$i; \
-+		[ -d $(PREFIX)/v6eval/man/man$$i ] || mkdir $(PREFIX)/v6eval/man/man$$i; \
- 	done
--	install -c -o bin -g bin -m 444 $(DOCFILES) $(PREFIX)/doc
-+	${BSD_INSTALL_DATA} $(DOCFILES) $(PREFIX)/v6eval/doc
- 
- .include <bsd.subdir.mk>
diff --git a/net/v6eval/files/patch-bin-remotes-Makefile b/net/v6eval/files/patch-bin-remotes-Makefile
deleted file mode 100644
index 06aa2480ad93..000000000000
--- a/net/v6eval/files/patch-bin-remotes-Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- bin/remotes/Makefile.orig	2013-06-17 00:08:29.000000000 +0900
-+++ bin/remotes/Makefile	2013-06-17 00:17:24.000000000 +0900
-@@ -46,13 +46,13 @@
- SUBDIR=	unknown	\
- 	manual
- 
--PREFIX=/usr/local/v6eval
-+PREFIX?=/usr/local
- DOCFILES=00README
- 
- depend:
- 
- afterinstall:
--	install -d -o bin -g bin -m 755 $(PREFIX)/bin
--	install -c -o bin -g bin -m 444 $(DOCFILES) $(PREFIX)/bin/
-+	install -d -m 555 $(PREFIX)/v6eval/bin
-+	${BSD_INSTALL_DATA} $(DOCFILES) $(PREFIX)/v6eval/bin/
- 
- .include <bsd.subdir.mk>
diff --git a/net/v6eval/files/patch-bin-remotes-manual-Makefile b/net/v6eval/files/patch-bin-remotes-manual-Makefile
deleted file mode 100644
index 1454b0a858ce..000000000000
--- a/net/v6eval/files/patch-bin-remotes-manual-Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
---- bin/remotes/manual/Makefile.orig	2009-11-25 16:50:24.000000000 +0900
-+++ bin/remotes/manual/Makefile	2013-06-17 00:39:02.000000000 +0900
-@@ -41,8 +41,8 @@
- # THE POSSIBILITY OF SUCH DAMAGE.
- #
- 
--PREFIX=/usr/local/v6eval
--RMTDIR=$(PREFIX)/bin/manual
-+PREFIX?=/usr/local
-+RMTDIR=$(PREFIX)/v6eval/bin/manual
- REMOTES=	cleardefr.rmt		\
- 		clearmtu.rmt		\
- 		clearnc.rmt		\
-@@ -106,6 +106,6 @@
- clean:
- 
- install:
--	install -d -o bin -g bin -m 755 $(PREFIX)/bin
--	install -d -o bin -g bin -m 755 $(RMTDIR)
--	install -c -o bin -g bin -m 555 $(REMOTES) $(RMTDIR)
-+	install -d -m 555 $(PREFIX)/v6eval/bin
-+	install -d -m 555 $(RMTDIR)
-+	${BSD_INSTALL_SCRIPT} $(REMOTES) $(RMTDIR)
diff --git a/net/v6eval/files/patch-bin-remotes-unknown-Makefile b/net/v6eval/files/patch-bin-remotes-unknown-Makefile
deleted file mode 100644
index 180a6bd8988c..000000000000
--- a/net/v6eval/files/patch-bin-remotes-unknown-Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
---- bin/remotes/unknown/Makefile.orig	2005-11-10 12:54:12.000000000 +0900
-+++ bin/remotes/unknown/Makefile	2013-06-17 00:39:47.000000000 +0900
-@@ -43,8 +43,8 @@
- 
- PRODUCT=unknown
- 
--PREFIX=/usr/local/v6eval
--RMTDIR=$(PREFIX)/bin/$(PRODUCT)
-+PREFIX?=/usr/local
-+RMTDIR=$(PREFIX)/v6eval/bin/$(PRODUCT)
- REMOTES=	cleardefr.rmt		\
- 		clearmtu.rmt		\
- 		clearnc.rmt		\
-@@ -101,6 +101,6 @@
- clean:
- 
- install:
--	install -d -o bin -g bin -m 755 $(PREFIX)/bin
--	install -d -o bin -g bin -m 755 $(RMTDIR)
--	install -c -o bin -g bin -m 555 $(REMOTES) $(RMTDIR)
-+	install -d -m 555 $(PREFIX)/v6eval/bin
-+	install -d -m 555 $(RMTDIR)
-+	${BSD_INSTALL_SCRIPT} $(REMOTES) $(RMTDIR)
diff --git a/net/v6eval/files/patch-bin_dhcomp_dhcomp.cc b/net/v6eval/files/patch-bin_dhcomp_dhcomp.cc
deleted file mode 100644
index 381f366b98a6..000000000000
--- a/net/v6eval/files/patch-bin_dhcomp_dhcomp.cc
+++ /dev/null
@@ -1,23 +0,0 @@
---- bin/dhcomp/dhcomp.cc.orig	2013-06-16 10:59:39.000000000 +0900
-+++ bin/dhcomp/dhcomp.cc	2013-06-16 11:00:26.000000000 +0900
-@@ -315,14 +315,14 @@
- 	memcpy(&pSharedKey[iSharedKeyLen - l], pSharedKeyStock, l);
- 
- #ifdef TAHI
--	printf("log:DHComp_Results                  (length:%i)\n",
--		xflag? iSharedKeyLen: strlen(pSharedKey));
--	printf("log:| Shared_Key                      (length:%i)\n",
--		xflag? iSharedKeyLen: strlen(pSharedKey));
-+	printf("log:DHComp_Results                  (length:%zu)\n",
-+		xflag? (size_t)iSharedKeyLen: strlen(pSharedKey));
-+	printf("log:| Shared_Key                      (length:%zu)\n",
-+		xflag? (size_t)iSharedKeyLen: strlen(pSharedKey));
- 	xflag? xPrintResult(pSharedKey): PrintResult(pSharedKey);
- #else	// TAHI
--	printf("log:DHComp_Results                  (length:%i)\n", strlen(pSharedKey));
--	printf("log:| Shared_Key                      (length:%i)\n", strlen(pSharedKey));
-+	printf("log:DHComp_Results                  (length:%zu)\n", strlen(pSharedKey));
-+	printf("log:| Shared_Key                      (length:%zu)\n", strlen(pSharedKey));
- 	PrintResult(pSharedKey);
- #endif	// TAHI
- 
diff --git a/net/v6eval/files/patch-bin_dhgen_dhgen.cc b/net/v6eval/files/patch-bin_dhgen_dhgen.cc
deleted file mode 100644
index 3e715de32e96..000000000000
--- a/net/v6eval/files/patch-bin_dhgen_dhgen.cc
+++ /dev/null
@@ -1,47 +0,0 @@
---- bin/dhgen/dhgen.cc.orig	2013-06-16 10:57:08.000000000 +0900
-+++ bin/dhgen/dhgen.cc	2013-06-16 10:59:01.000000000 +0900
-@@ -233,21 +233,21 @@
- 	}
- 
- #ifdef TAHI
--	printf("log:DHGen_Results                   (length:%i)\n",
-+	printf("log:DHGen_Results                   (length:%zu)\n",
- 		xflag?
--			BN_num_bytes(pDH->pub_key) +
--				BN_num_bytes(pDH->priv_key):
-+			(size_t)(BN_num_bytes(pDH->pub_key) +
-+				BN_num_bytes(pDH->priv_key)):
- 			strlen(pPubKey) + strlen(pPrivKey));
- #else	// TAHI
--	printf("log:DHGen_Results                   (length:%i)\n", strlen(pPubKey) + strlen(pPrivKey));
-+	printf("log:DHGen_Results                   (length:%zu)\n", strlen(pPubKey) + strlen(pPrivKey));
- #endif	// TAHI
- #ifdef TAHI
--	printf("log:| Public_Key                      (length:%i)\n",
-+	printf("log:| Public_Key                      (length:%zu)\n",
- 		xflag?
--			BN_num_bytes(pDH->pub_key):
-+			(size_t)BN_num_bytes(pDH->pub_key):
- 			strlen(pPubKey));
- #else	// TAHI
--	printf("log:| Public_Key                      (length:%i)\n", strlen(pPubKey));
-+	printf("log:| Public_Key                      (length:%zu)\n", strlen(pPubKey));
- #endif	// TAHI
- #ifdef TAHI
- 	xflag? xPrintResult(pPubKey): PrintResult(pPubKey);
-@@ -255,12 +255,12 @@
- 	PrintResult(pPubKey);
- #endif	// TAHI
- #ifdef TAHI
--	printf("log:| Private_Key                     (length:%i)\n",
-+	printf("log:| Private_Key                     (length:%zu)\n",
- 		xflag?
--			BN_num_bytes(pDH->priv_key):
-+			(size_t)BN_num_bytes(pDH->priv_key):
- 			strlen(pPrivKey));
- #else	// TAHI
--	printf("log:| Private_Key                     (length:%i)\n", strlen(pPrivKey));
-+	printf("log:| Private_Key                     (length:%zu)\n", strlen(pPrivKey));
- #endif	// TAHI
- #ifdef TAHI
- 	xflag? xPrintResult(pPrivKey): PrintResult(pPrivKey);
diff --git a/net/v6eval/files/patch-bin_sigcomp_sigcomp.c b/net/v6eval/files/patch-bin_sigcomp_sigcomp.c
deleted file mode 100644
index 127af9bfbc5b..000000000000
--- a/net/v6eval/files/patch-bin_sigcomp_sigcomp.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- bin/sigcomp/sigcomp.c.orig	2008-04-03 09:34:43.000000000 +0900
-+++ bin/sigcomp/sigcomp.c	2013-06-16 11:06:24.000000000 +0900
-@@ -57,6 +57,9 @@
- 
- #include <openssl/rsa.h>
- 
-+#ifdef OPENSSL_NO_MD2
-+const EVP_MD *EVP_md2(void);
-+#endif
- 
- #ifdef DEBUG
- #ifndef dbg
diff --git a/net/v6eval/files/patch-etc-Makefile b/net/v6eval/files/patch-etc-Makefile
deleted file mode 100644
index 710e6dae8262..000000000000
--- a/net/v6eval/files/patch-etc-Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- etc/Makefile.orig	2013-06-17 00:07:30.000000000 +0900
-+++ etc/Makefile	2013-06-17 00:18:09.000000000 +0900
-@@ -43,15 +43,15 @@
- # Makefile for sample config file
- #
- 
--PREFIX=/usr/local/v6eval
--ETCDIR=$(PREFIX)/etc
-+PREFIX?=/usr/local
-+ETCDIR=$(PREFIX)/v6eval/etc
- SAMPLE=tn.def.sample nut.def.sample
- 
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(ETCDIR)
--	install -c -o bin -g bin -m 644 $(SAMPLE) $(ETCDIR)
-+	install -d -m 555 $(ETCDIR)
-+	${BSD_INSTALL_DATA} $(SAMPLE) $(ETCDIR)
- 
- depend:
- 
diff --git a/net/v6eval/files/patch-include-Makefile b/net/v6eval/files/patch-include-Makefile
deleted file mode 100644
index ff80dac0e4d7..000000000000
--- a/net/v6eval/files/patch-include-Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
---- include/Makefile.orig	2013-06-17 00:06:14.000000000 +0900
-+++ include/Makefile	2013-06-17 00:18:39.000000000 +0900
-@@ -45,17 +45,17 @@
- # Makefile for standard definition file
- #
- 
--PREFIX=/usr/local/v6eval
--INCLUDEDIR=$(PREFIX)/include/
-+PREFIX?=/usr/local
-+INCLUDEDIR=$(PREFIX)/v6eval/include/
- 
- all:
- 
- install:
--	install -d -o bin -g bin -m 755 $(INCLUDEDIR)
--	install -c -o bin -g bin -m 644 std.def       $(INCLUDEDIR)
--	install -c -o bin -g bin -m 644 stdaddr.def   $(INCLUDEDIR)
--	install -c -o bin -g bin -m 644 stdpacket.def $(INCLUDEDIR)
--	install -c -o bin -g bin -m 644 stdconst.def $(INCLUDEDIR)
-+	install -d -m 555 $(INCLUDEDIR)
-+	${BSD_INSTALL_DATA} std.def       $(INCLUDEDIR)
-+	${BSD_INSTALL_DATA} stdaddr.def   $(INCLUDEDIR)
-+	${BSD_INSTALL_DATA} stdpacket.def $(INCLUDEDIR)
-+	${BSD_INSTALL_DATA} stdconst.def $(INCLUDEDIR)
- 
- depend:
- clean:
diff --git a/net/v6eval/files/patch-lib_Cm_CmAgent.h b/net/v6eval/files/patch-lib_Cm_CmAgent.h
deleted file mode 100644
index 598a2c32bafe..000000000000
--- a/net/v6eval/files/patch-lib_Cm_CmAgent.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- lib/Cm/CmAgent.h.orig	2013-06-16 10:41:30.000000000 +0900
-+++ lib/Cm/CmAgent.h	2013-06-16 10:42:30.000000000 +0900
-@@ -46,11 +46,11 @@
- #define _Cm_CmAgent_h_	1
- /* Interface Definition */
- #include "CmReceiver.h"
--struct CmAgent;
-+class CmAgent;
- typedef int (CmAgent::*agentFunc)(int);
- typedef int (CmAgent::*timerFunc)(time_t,uint32_t);
--struct CmDispatch;
--struct CmAgent:public CmReceiver {
-+class CmDispatch;
-+class CmAgent:public CmReceiver {
- private:
- 	agentFunc readAction_;
- 	agentFunc writeAction_;
diff --git a/net/v6eval/files/patch-lib_Cm_CmLexer.h b/net/v6eval/files/patch-lib_Cm_CmLexer.h
deleted file mode 100644
index fd7f002c37ff..000000000000
--- a/net/v6eval/files/patch-lib_Cm_CmLexer.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/Cm/CmLexer.h.orig	2003-12-04 13:59:47.000000000 +0900
-+++ lib/Cm/CmLexer.h	2013-06-16 10:32:18.000000000 +0900
-@@ -49,10 +49,8 @@
- #include "CmToken.h"
- #include <stdio.h>
- 
--#if !(defined(__FreeBSD__) && __FreeBSD__ >= 4)
--
--const int32_t	YYERRCODE=256;
--
-+#ifndef YYERRCODE
-+#define	YYERRCODE	256
- #endif
- 
- class PObject;
diff --git a/net/v6eval/files/patch-lib_Cm_CmMain.cc b/net/v6eval/files/patch-lib_Cm_CmMain.cc
deleted file mode 100644
index d9f46e37fe09..000000000000
--- a/net/v6eval/files/patch-lib_Cm_CmMain.cc
+++ /dev/null
@@ -1,61 +0,0 @@
---- lib/Cm/CmMain.cc.orig	2009-08-27 09:10:04.000000000 +0900
-+++ lib/Cm/CmMain.cc	2013-05-04 04:59:43.000000000 +0900
-@@ -48,13 +48,17 @@
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <sys/param.h>
-+#if __FreeBSD_version <= 900006
- #include <utmp.h>
-+#else
-+#include <utmpx.h>
-+#endif
- #include <time.h>
- #include <pwd.h>
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/resource.h>
--#include <sys/param.h>
- extern int causeStopSignals[];
- static int stopSingals[]={SIGINT,SIGQUIT,SIGTERM,0};
- extern void applicationMain(CmMain*);
-@@ -129,21 +133,37 @@
- 
- //----------------------------------------------------------------------
- // ¾ã³²²òÀϾðÊóºîÀ®
-+#if __FreeBSD_version <= 900006
- static struct utmp *myUtmpEnt(FILE *in,struct utmp *u) {
--	int s=ttyslot();
-+	int s = 0;
- 	if(s<0||fseek(in,sizeof(struct utmp)*s,0)<0||
- 		fread(u,sizeof(struct utmp),1,in)==0) {return 0;}
- 	return u;}
- void CmMain::makeCatch2Eye(STR p) {
- static char catch2[]=" on %*.*s:%-*.*s from %*.*s";
- 	struct utmp ux[1], *u; FILE *in;
--	if((in=fopen("/etc/utmp","r"))==NULL) {return;}
-+	if((in=fopen(_PATH_UTMP,"r"))==NULL) {return;}
- 	u=myUtmpEnt(in,ux); fclose(in);
- 	if(!u) {return;}
- #define A(a)sizeof(a),sizeof(a),a
- 	sprintf(p,catch2,A(u->ut_line),A(u->ut_name),A(u->ut_host));
- #undef A
- 	return;}
-+#else
-+void CmMain::makeCatch2Eye(STR p) {
-+static char catch2[]=" on %*.*s:%-*.*s from %*.*s";
-+	struct utmpx ux, *u;
-+	memset(&ux, 0, sizeof(ux));
-+	ux.ut_type = USER_PROCESS; 
-+	snprintf(ux.ut_user, sizeof(ux.ut_user), "%d", getuid());
-+	u = getutxuser(ux.ut_user);
-+	if (u == NULL)
-+		return;
-+#define A(a)sizeof(a),sizeof(a),a
-+	sprintf(p, catch2, A(u->ut_line), A(u->ut_user), A(u->ut_host));
-+#undef A
-+	return;}
-+#endif
- void CmMain::makeCatchEye(const STR pgmName) {
- static char catch1[]="@(#) %02d/%02d/%02d %02d:%02d:%02d %s STARTED by %s@%s";
- 	time_t now=time(0); struct tm *m=localtime(&now);
diff --git a/net/v6eval/files/patch-lib_Cm_CmMain.h b/net/v6eval/files/patch-lib_Cm_CmMain.h
deleted file mode 100644
index 91629ade76a7..000000000000
--- a/net/v6eval/files/patch-lib_Cm_CmMain.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Cm/CmMain.h.orig	2013-06-16 10:53:42.000000000 +0900
-+++ lib/Cm/CmMain.h	2013-06-16 10:54:05.000000000 +0900
-@@ -100,7 +100,7 @@
- // µ¯Æ°»þ¹ï ¥×¥í¥°¥é¥à̾ STARTED by µ¯Æ°¥æ¡¼¥¶@µ¯Æ°¥Þ¥·¥ó on
- // ttyname:¥í¥°¥¤¥ó¥æ¡¼¥¶Ì¾ from ¥ê¥â¡¼¥È¥Þ¥·¥ó̾
- //----------------------------------------------------------------------
--struct CmMain {
-+class CmMain {
- private:
- static	STR applicationName_;		// µ¯Æ°¥³¥Þ¥ó¥É̾
- static	char catchStart_[256];		// ¾ã³²²òÀϾðÊó
diff --git a/net/v6eval/files/patch-lib_Cm_CmSocket.h b/net/v6eval/files/patch-lib_Cm_CmSocket.h
deleted file mode 100644
index 3459ec5e9806..000000000000
--- a/net/v6eval/files/patch-lib_Cm_CmSocket.h
+++ /dev/null
@@ -1,62 +0,0 @@
---- lib/Cm/CmSocket.h.orig	2003-10-23 13:37:30.000000000 +0900
-+++ lib/Cm/CmSocket.h	2013-06-16 10:52:19.000000000 +0900
-@@ -147,9 +147,9 @@
- inline int CmSockAddr::length() const {return length_;}
- inline sock* CmSockAddr::sockAddr() const {return addr_;}
- 
--struct SocketSet;
-+class SocketSet;
- //======================================================================
--struct CmSocket:public CmSockAddr {
-+class CmSocket:public CmSockAddr {
- private:
- 	int fileDesc_;
- 	int syserrno_;
-@@ -250,7 +250,7 @@
- 
- //======================================================================
- // Stream Specific Functions
--struct CmStream:public CmSocket {
-+class CmStream:public CmSocket {
- private:
- 	CmSockAddr* self_;
- 	CmSockAddr* peer_;
-@@ -284,7 +284,8 @@
- // Datagram Socket can be used with connect and send/receive,
- // and can be specified the receiver when sending or can be given
- // the sender when receiving.
--struct CmDgram:public CmSocket {
-+class CmDgram:public CmSocket {
-+public:
- 	CmDgram(int l,const sock* s=0,int fd=-1);
- 	CmDgram(const inSock&,int fd=-1);
- 	CmDgram(const in6Sock&,int fd=-1);
-@@ -300,7 +301,8 @@
- 
- //======================================================================
- // Raw Specific Functions
--struct CmRaw:public CmDgram {
-+class CmRaw:public CmDgram {
-+public:
- 	CmRaw(int l,const sock* s=0,int fd=-1);
- virtual	int socket();
- virtual	CmSocket* create(int,const sock*,int=-1);
-@@ -310,7 +312,8 @@
- //======================================================================
- // for Unix Domain Socket
- //	It can be stream/datagram and any address or pathname.
--struct UnixSocket {
-+class UnixSocket {
-+public:
- static CmSocket* stream();
- static CmSocket* stream(CSTR aName);
- static CmDgram* datagram();
-@@ -323,7 +326,7 @@
- // for Inet Domain Socket
- //	It can be stream/datagram and any address or service
- //	with/without hostname/ipaddress.
--struct InetSocket {
-+class InetSocket {
- static int getService(CSTR serv);
- //----------------------------------------------------------------------
- // defaultService is used for debugging.
diff --git a/net/v6eval/files/patch-lib_Pz_McIKE.cc b/net/v6eval/files/patch-lib_Pz_McIKE.cc
deleted file mode 100644
index 59f72c012389..000000000000
--- a/net/v6eval/files/patch-lib_Pz_McIKE.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/Pz/McIKE.cc.orig	2013-06-16 10:34:07.000000000 +0900
-+++ lib/Pz/McIKE.cc	2013-06-16 10:34:49.000000000 +0900
-@@ -380,7 +380,7 @@
- 
- 		if(padlen < sizeof(struct isakmp_gen)) {
- 			fprintf(stderr,
--				"err: ISAKMP Pld_ISAKMP decode(%d) "
-+				"err: ISAKMP Pld_ISAKMP decode(%zu) "
- 				"over remain size(%d)\n",
- 				sizeof(struct isakmp_gen), padlen);
- 
-@@ -390,7 +390,7 @@
- 
- 		if(plen < sizeof(struct isakmp_gen)) {
- 			fprintf(stderr,
--				"err: ISAKMP Pld_ISAKMP decode(%d) "
-+				"err: ISAKMP Pld_ISAKMP decode(%zu) "
- 				"over ISAKMP PayloadLength(%d)\n",
- 				sizeof(struct isakmp_gen), plen);
- 
diff --git a/net/v6eval/files/patch-lib_Pz_McSNMP.cc b/net/v6eval/files/patch-lib_Pz_McSNMP.cc
deleted file mode 100644
index d66c17bc5293..000000000000
--- a/net/v6eval/files/patch-lib_Pz_McSNMP.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Pz/McSNMP.cc.orig	2013-06-16 10:35:43.000000000 +0900
-+++ lib/Pz/McSNMP.cc	2013-06-16 10:36:50.000000000 +0900
-@@ -563,7 +563,7 @@
- 	COCTSTR s=string();
- 	for(i=0;i<i9;i++)
- 		printf("%02x",s[i]&0xff);
--	printf((tag!=0&&length()>16)?tag:"");
-+	printf("%s", (tag!=0&&length()>16)?tag:"");
- 	int a=(int)(s[0]&0xff);
- 	sprintf(tmp, "%d.%d.",(int)(a/40), (int)(a%40));
- 	/* ASN.1 decode */	
diff --git a/net/v6eval/files/patch-lib_Pz_MvFunction.cc b/net/v6eval/files/patch-lib_Pz_MvFunction.cc
deleted file mode 100644
index 20a6ba0340d7..000000000000
--- a/net/v6eval/files/patch-lib_Pz_MvFunction.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/Pz/MvFunction.cc.orig	2013-06-16 10:37:30.000000000 +0900
-+++ lib/Pz/MvFunction.cc	2013-06-16 10:38:07.000000000 +0900
-@@ -352,9 +352,9 @@
- 	uint32_t d = 0;
- 
- 	for(d = 0; d < buflen; d ++) {
--		if((buf[d] < '0') || (buf[d] > '9') &&
--		   (buf[d] < 'A') || (buf[d] > 'F') &&
--		   (buf[d] < 'a') || (buf[d] > 'f')) {
-+		if(((buf[d] < '0') || (buf[d] > '9')) &&
-+		   ((buf[d] < 'A') || (buf[d] > 'F')) &&
-+		   ((buf[d] < 'a') || (buf[d] > 'f'))) {
- 			return false;
- 		}
- 	}
diff --git a/net/v6eval/files/patch-lib_Pz_PvAction.cc b/net/v6eval/files/patch-lib_Pz_PvAction.cc
deleted file mode 100644
index 6f7ecd614328..000000000000
--- a/net/v6eval/files/patch-lib_Pz_PvAction.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Pz/PvAction.cc.orig	2013-06-16 10:39:01.000000000 +0900
-+++ lib/Pz/PvAction.cc	2013-06-16 10:39:29.000000000 +0900
-@@ -55,7 +55,7 @@
- PvAction::~PvAction() {}
- void PvAction::print() const {
- 	CSTR s=meta()->string();
--	printf(s);}
-+	printf("%s", s);}
- 
- //======================================================================
- PvAUTO::PvAUTO(const MObject* m,CSTR f,int l):PvAction(m,f,l){}
diff --git a/net/v6eval/files/patch-lib_pkt_Makefile b/net/v6eval/files/patch-lib_pkt_Makefile
deleted file mode 100644
index 624937bf99be..000000000000
--- a/net/v6eval/files/patch-lib_pkt_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/pkt/Makefile.orig	2013-05-04 05:06:29.000000000 +0900
-+++ lib/pkt/Makefile	2013-05-04 05:06:32.000000000 +0900
-@@ -5,6 +5,9 @@
- 	BpfAgent.cc Bpfilter.cc Ringbuf.cc RunEnv.cc PktCtlClient.cc \
- 	PktSndClient.cc PktRcvClient.cc PktBuf.cc PktQueue.cc bufStat.cc
- 
-+LxLexer.o: PzParse.h
-+PzParse.h: PzParse.cc
-+
- CXXFLAGS+=	-I. -I$(Cm) -I$(Pz) -DHAVE_BPF_HDRCMPLT -I/usr/include
- # CXXFLAGS+=	-DVCLEAR_DBG
- 
diff --git a/net/v6eval/files/patch-lib_pkt_PktClient.h b/net/v6eval/files/patch-lib_pkt_PktClient.h
deleted file mode 100644
index 6ccee60436d3..000000000000
--- a/net/v6eval/files/patch-lib_pkt_PktClient.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/pkt/PktClient.h.orig	2013-06-16 10:55:15.000000000 +0900
-+++ lib/pkt/PktClient.h	2013-06-16 10:55:31.000000000 +0900
-@@ -46,8 +46,8 @@
- #define	__PktClient_h__	1
- #include "pktDefine.h"
- #include "PktRecv.h"
--struct CmDispatch;
--struct PktClient:public PktReceiver {
-+class CmDispatch;
-+class PktClient:public PktReceiver {
- private:
- 	CmDispatch* dispatch_;
- public:
diff --git a/net/v6eval/files/patch-sample-Makefile b/net/v6eval/files/patch-sample-Makefile
deleted file mode 100644
index 010ff1beb68c..000000000000
--- a/net/v6eval/files/patch-sample-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- sample/Makefile.orig	2013-06-16 23:58:56.000000000 +0900
-+++ sample/Makefile	2013-06-16 23:59:19.000000000 +0900
-@@ -2,7 +2,7 @@
- # Makefile
- #
- 
--AUTORUN=../bin/autorun/autorun
-+AUTORUN=	${.CURDIR}/../bin/autorun
- 
- check:
- 	$(AUTORUN) -t INDEX
diff --git a/net/v6eval/files/patch-script-pmod-V6evalCommon-V6evalCommon.pm b/net/v6eval/files/patch-script-pmod-V6evalCommon-V6evalCommon.pm
deleted file mode 100644
index 1e552c6ad704..000000000000
--- a/net/v6eval/files/patch-script-pmod-V6evalCommon-V6evalCommon.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- script/pmod/V6evalCommon/V6evalCommon.pm.orig	2013-06-17 00:13:33.000000000 +0900
-+++ script/pmod/V6evalCommon/V6evalCommon.pm	2013-06-17 00:19:20.000000000 +0900
-@@ -70,7 +70,7 @@
-         $path,           # path  
-     ) = @_; 
- 	($SeqName,$SeqDir,$SeqSuffix) = fileparse($0,'.seq');
--	$V6EVALPREFIX= "/usr/local/v6eval";
-+	$V6EVALPREFIX= "%%PREFIX%%/v6eval";
- 	$V6EVALROOT  = $path            || $ENV{V6EVALROOT} || $V6EVALPREFIX;
- 	$V6EVALBIN   = $ENV{V6EVALBIN}  || "$V6EVALROOT/bin/";
- 	$V6EVALETC   = $ENV{V6EVALETC}  || "./:$V6EVALROOT/etc/";
diff --git a/net/v6eval/files/pkg-message.in b/net/v6eval/files/pkg-message.in
deleted file mode 100644
index dd33d696caac..000000000000
--- a/net/v6eval/files/pkg-message.in
+++ /dev/null
@@ -1,5 +0,0 @@
-===============================================
-
-  Please read %%PREFIX%%/v6eval/doc/00README.
-
-===============================================
diff --git a/net/v6eval/pkg-descr b/net/v6eval/pkg-descr
deleted file mode 100644
index 7456b869f1e3..000000000000
--- a/net/v6eval/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-v6eval is platform of IPv6 Conformance Test kit.
-
-WWW: http://www.tahi.org/
diff --git a/net/v6eval/pkg-plist b/net/v6eval/pkg-plist
deleted file mode 100644
index c4f636f759b1..000000000000
--- a/net/v6eval/pkg-plist
+++ /dev/null
@@ -1,271 +0,0 @@
-v6eval/bin/00README
-v6eval/bin/autorun
-v6eval/bin/checker
-v6eval/bin/dhcomp
-v6eval/bin/dhgen
-v6eval/bin/file2hex
-v6eval/bin/indexgen
-v6eval/bin/ivcomp
-v6eval/bin/manual/cleardefr.rmt
-v6eval/bin/manual/clearmtu.rmt
-v6eval/bin/manual/clearnc.rmt
-v6eval/bin/manual/clearprefix.rmt
-v6eval/bin/manual/clearroute.rmt
-v6eval/bin/manual/dhcp6c.rmt
-v6eval/bin/manual/dhcp6r.rmt
-v6eval/bin/manual/dhcp6s.rmt
-v6eval/bin/manual/igmpv3.rmt
-v6eval/bin/manual/igmpv3config.rmt
-v6eval/bin/manual/ikeClearAll.rmt
-v6eval/bin/manual/ikeConfig.rmt
-v6eval/bin/manual/ikeDump.rmt
-v6eval/bin/manual/ikeEnable.rmt
-v6eval/bin/manual/ikeInitiate.rmt
-v6eval/bin/manual/ikeResetSA.rmt
-v6eval/bin/manual/ikeSetSA.rmt
-v6eval/bin/manual/ikeStart.rmt
-v6eval/bin/manual/ikeStop.rmt
-v6eval/bin/manual/ikeTunnel.rmt
-v6eval/bin/manual/ipsecClearAll.rmt
-v6eval/bin/manual/ipsecEnable.rmt
-v6eval/bin/manual/ipsecResetSPD.rmt
-v6eval/bin/manual/ipsecSetSAD.rmt
-v6eval/bin/manual/ipsecSetSPD.rmt
-v6eval/bin/manual/loginout.rmt
-v6eval/bin/manual/manualaddrconf.rmt
-v6eval/bin/manual/mip6EnableCN.rmt
-v6eval/bin/manual/mip6EnableHA.rmt
-v6eval/bin/manual/mip6EnableMN.rmt
-v6eval/bin/manual/mldv2.rmt
-v6eval/bin/manual/mldv2DisableHUT.rmt
-v6eval/bin/manual/mldv2DisableRUT.rmt
-v6eval/bin/manual/mldv2EnableHUT.rmt
-v6eval/bin/manual/mldv2EnableRUT.rmt
-v6eval/bin/manual/mldv2ListenerAPI.rmt
-v6eval/bin/manual/mldv2SetHUT.rmt
-v6eval/bin/manual/mldv2SetRUT.rmt
-v6eval/bin/manual/mldv2config.rmt
-v6eval/bin/manual/mtuconfig.rmt
-v6eval/bin/manual/multicastConfig.rmt
-v6eval/bin/manual/natpt.rmt
-v6eval/bin/manual/pim6dd.rmt
-v6eval/bin/manual/ping6.rmt
-v6eval/bin/manual/racontrol.rmt
-v6eval/bin/manual/reboot.rmt
-v6eval/bin/manual/reboot_async.rmt
-v6eval/bin/manual/ripng_start.rmt
-v6eval/bin/manual/ripng_stop.rmt
-v6eval/bin/manual/route.rmt
-v6eval/bin/manual/rtadvd.rmt
-v6eval/bin/manual/setDNS.rmt
-v6eval/bin/manual/showAddr.rmt
-v6eval/bin/manual/sysctl.rmt
-v6eval/bin/manual/tcp6.rmt
-v6eval/bin/manual/tunnel.rmt
-v6eval/bin/manual/useTempAddr.rmt
-v6eval/bin/pktbuf
-v6eval/bin/pktctl
-v6eval/bin/pktlint
-v6eval/bin/pktrecv
-v6eval/bin/pktsend
-v6eval/bin/prfcomp
-v6eval/bin/sigcomp
-v6eval/bin/x509dec
-v6eval/bin/unknown/cleardefr.rmt
-v6eval/bin/unknown/clearmtu.rmt
-v6eval/bin/unknown/clearnc.rmt
-v6eval/bin/unknown/clearprefix.rmt
-v6eval/bin/unknown/clearroute.rmt
-v6eval/bin/unknown/dhcp6c.rmt
-v6eval/bin/unknown/dhcp6r.rmt
-v6eval/bin/unknown/dhcp6s.rmt
-v6eval/bin/unknown/igmpv3.rmt
-v6eval/bin/unknown/igmpv3config.rmt
-v6eval/bin/unknown/ikeClearAll.rmt
-v6eval/bin/unknown/ikeConfig.rmt
-v6eval/bin/unknown/ikeDump.rmt
-v6eval/bin/unknown/ikeEnable.rmt
-v6eval/bin/unknown/ikeInitiate.rmt
-v6eval/bin/unknown/ikeResetSA.rmt
-v6eval/bin/unknown/ikeSetSA.rmt
-v6eval/bin/unknown/ikeStart.rmt
-v6eval/bin/unknown/ikeStop.rmt
-v6eval/bin/unknown/ikeTunnel.rmt
-v6eval/bin/unknown/ipsecClearAll.rmt
-v6eval/bin/unknown/ipsecEnable.rmt
-v6eval/bin/unknown/ipsecResetSPD.rmt
-v6eval/bin/unknown/ipsecSetSAD.rmt
-v6eval/bin/unknown/ipsecSetSPD.rmt
-v6eval/bin/unknown/loginout.rmt
-v6eval/bin/unknown/manualaddrconf.rmt
-v6eval/bin/unknown/mip6EnableCN.rmt
-v6eval/bin/unknown/mip6EnableHA.rmt
-v6eval/bin/unknown/mip6EnableMN.rmt
-v6eval/bin/unknown/mldv2.rmt
-v6eval/bin/unknown/mldv2config.rmt
-v6eval/bin/unknown/mtuconfig.rmt
-v6eval/bin/unknown/multicastConfig.rmt
-v6eval/bin/unknown/natpt.rmt
-v6eval/bin/unknown/pim6dd.rmt
-v6eval/bin/unknown/ping6.rmt
-v6eval/bin/unknown/racontrol.rmt
-v6eval/bin/unknown/reboot.rmt
-v6eval/bin/unknown/reboot_async.rmt
-v6eval/bin/unknown/ripng_start.rmt
-v6eval/bin/unknown/ripng_stop.rmt
-v6eval/bin/unknown/route.rmt
-v6eval/bin/unknown/rtadvd.rmt
-v6eval/bin/unknown/setDNS.rmt
-v6eval/bin/unknown/showAddr.rmt
-v6eval/bin/unknown/sysctl.rmt
-v6eval/bin/unknown/tcp6.rmt
-v6eval/bin/unknown/tunnel.rmt
-v6eval/bin/unknown/useTempAddr.rmt
-v6eval/doc/00README
-v6eval/doc/00README.v6eval
-v6eval/doc/CHANGELOG
-v6eval/doc/CHANGELOG.v6eval
-v6eval/doc/INSTALL
-v6eval/doc/INSTALL.v6eval
-v6eval/doc/INSTALL.dummies
-v6eval/etc/nut.def.sample
-v6eval/etc/tn.def.sample
-v6eval/include/std.def
-v6eval/include/stdaddr.def
-v6eval/include/stdconst.def
-v6eval/include/stdpacket.def
-v6eval/sample/64tunnel_ll_ping/packet.def
-v6eval/sample/64tunnel_ll_ping/ping.html
-v6eval/sample/64tunnel_ll_ping/ping.seq
-v6eval/sample/HBHoptAfterDstOpt/HBHoptAfterDstOpt.html
-v6eval/sample/HBHoptAfterDstOpt/HBHoptAfterDstOpt.seq
-v6eval/sample/HBHoptAfterDstOpt/packet.def
-v6eval/sample/INDEX
-v6eval/sample/Makefile
-v6eval/sample/jumbo/jumbo.html
-v6eval/sample/jumbo/jumbo.seq
-v6eval/sample/jumbo/packet.def
-v6eval/sample/mld-general/mld-general.html
-v6eval/sample/mld-general/mld-general.seq
-v6eval/sample/mld-general/packet.def
-v6eval/sample/na_w_mtu/na_w_mtu.html
-v6eval/sample/na_w_mtu/na_w_mtu.seq
-v6eval/sample/na_w_mtu/packet.def
-v6eval/sample/ping/packet.def
-v6eval/sample/ping/ping.html
-v6eval/sample/ping/ping.seq
-v6eval/sample/ping4/packet.def
-v6eval/sample/ping4/ping4.html
-v6eval/sample/ping4/ping4.seq
-v6eval/sample/ping_frag/packet.def
-v6eval/sample/ping_frag/ping_frag.html
-v6eval/sample/ping_frag/ping_frag.seq
-v6eval/sample/ping_from_many_host/packet.def
-v6eval/sample/ping_from_many_host/ping.html
-v6eval/sample/ping_from_many_host/ping.seq
-v6eval/sample/ping_glosite/packet.def
-v6eval/sample/ping_glosite/ping_glosite.html
-v6eval/sample/ping_glosite/ping_glosite.seq
-v6eval/sample/ping_w_ah/packet.def
-v6eval/sample/ping_w_ah/ping.html
-v6eval/sample/ping_w_ah/ping.seq
-v6eval/sample/ping_w_ah/setkey.cf
-v6eval/sample/ping_w_ahesp/packet.def
-v6eval/sample/ping_w_ahesp/ping.html
-v6eval/sample/ping_w_ahesp/ping.seq
-v6eval/sample/ping_w_ahesp/setkey.cf
-v6eval/sample/ping_w_esp/packet.def
-v6eval/sample/ping_w_esp/ping.html
-v6eval/sample/ping_w_esp/ping.seq
-v6eval/sample/ping_w_esp/setkey.cf
-v6eval/sample/ping_w_espicv/packet.def
-v6eval/sample/ping_w_espicv/ping.html
-v6eval/sample/ping_w_espicv/ping.seq
-v6eval/sample/ping_w_espicv/setkey.cf
-v6eval/sample/ping_w_espicvespicv/packet.def
-v6eval/sample/ping_w_espicvespicv/ping.html
-v6eval/sample/ping_w_espicvespicv/ping.seq
-v6eval/sample/ping_w_espicvespicv/setkey.cf
-v6eval/sample/portunreach/packet.def
-v6eval/sample/portunreach/portunreach.html
-v6eval/sample/portunreach/portunreach.seq
-v6eval/sample/redirect/packet.def
-v6eval/sample/redirect/redirect.html
-v6eval/sample/redirect/redirect.seq
-v6eval/sample/timeexceeded/packet.def
-v6eval/sample/timeexceeded/timeexceeded.html
-v6eval/sample/timeexceeded/timeexceeded.seq
-v6eval/sample/udpecho/packet.def
-v6eval/sample/udpecho/udpecho.html
-v6eval/sample/udpecho/udpecho.seq
-v6eval/sample/unknownnext/packet.def
-v6eval/sample/unknownnext/unknownnext.html
-v6eval/sample/unknownnext/unknownnext.seq
-v6eval/sample_stddef/SendRecv/Recv.seq
-v6eval/sample_stddef/SendRecv/Send.seq
-v6eval/sample_stddef/SendRecv/packet.def
-v6eval/sample_stddef/aes-ctr/aes-ctr.seq
-v6eval/sample_stddef/aes-ctr/packet.def
-v6eval/sample_stddef/igmp/igmpv3_test.def
-v6eval/sample_stddef/igmp/igmpv3_test.seq
-v6eval/sample_stddef/igmp/igmpv3_test.sh
-v6eval/sample_stddef/mldv2/mldv2_test.def
-v6eval/sample_stddef/mldv2/mldv2_test.seq
-v6eval/sample_stddef/mldv2/mldv2_test.sh
-v6eval/sample_stddef/ping_frag/packet.def
-v6eval/sample_stddef/ping_frag/ping_frag.seq
-v6eval/sample_stddef/ping_glosite/packet.def
-v6eval/sample_stddef/ping_glosite/ping_glosite.seq
-v6eval/sample_stddef/snmp/snmp.def
-v6eval/sample_stddef/snmp/snmp.seq
-v6eval/sample_stddef/snmp/snmp_sample.sh
-v6eval/sample_stddef/tcp_handshake/packet.def
-v6eval/sample_stddef/tcp_handshake/tcp_handshake.seq
-@dirrm v6eval/sample_stddef/tcp_handshake
-@dirrm v6eval/sample_stddef/snmp
-@dirrm v6eval/sample_stddef/ping_glosite
-@dirrm v6eval/sample_stddef/ping_frag
-@dirrm v6eval/sample_stddef/mldv2
-@dirrm v6eval/sample_stddef/igmp
-@dirrm v6eval/sample_stddef/aes-ctr
-@dirrm v6eval/sample_stddef/SendRecv
-@dirrm v6eval/sample_stddef
-@dirrm v6eval/sample/unknownnext
-@dirrm v6eval/sample/udpecho
-@dirrm v6eval/sample/timeexceeded
-@dirrm v6eval/sample/redirect
-@dirrm v6eval/sample/portunreach
-@dirrm v6eval/sample/ping_w_espicvespicv
-@dirrm v6eval/sample/ping_w_espicv
-@dirrm v6eval/sample/ping_w_esp
-@dirrm v6eval/sample/ping_w_ahesp
-@dirrm v6eval/sample/ping_w_ah
-@dirrm v6eval/sample/ping_glosite
-@dirrm v6eval/sample/ping_from_many_host
-@dirrm v6eval/sample/ping_frag
-@dirrm v6eval/sample/ping4
-@dirrm v6eval/sample/ping
-@dirrm v6eval/sample/na_w_mtu
-@dirrm v6eval/sample/mld-general
-@dirrm v6eval/sample/jumbo
-@dirrm v6eval/sample/HBHoptAfterDstOpt
-@dirrm v6eval/sample/64tunnel_ll_ping
-@dirrm v6eval/sample
-@dirrm v6eval/bin/manual
-@dirrm v6eval/bin/unknown
-@dirrm v6eval/bin
-@dirrmtry v6eval/doc
-@dirrm v6eval/include
-@dirrm v6eval/man/man1
-@dirrm v6eval/man
-@dirrmtry v6eval/etc
-@dirrmtry v6eval
-%%SITE_PERL%%/V6evalCommon.pm
-%%SITE_PERL%%/V6evalRemote.pm
-%%SITE_PERL%%/V6evalTool.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalCommon/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalRemote/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalTool/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalCommon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalRemote
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalTool
diff --git a/net/vchat/Makefile b/net/vchat/Makefile
deleted file mode 100644
index 1773d4616b20..000000000000
--- a/net/vchat/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Andreas Wetzel <mickey@netassembly.de>
-# $FreeBSD$
-
-PORTNAME=	vchat
-PORTVERSION=	2.42c
-CATEGORIES=	net
-MASTER_SITES=	http://www.enforcer.cc/vchat/filez/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Client software for taking part in VChat conferences
-
-GNU_CONFIGURE=	yes
-
-MAN1=		vchat.1
-MAN5=		vchatrc.5
-MAN8=		vchatd.8
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PLIST_FILES=	bin/vchat libexec/vchatd
-
-NO_STAGE=	yes
-.include <bsd.port.mk>
diff --git a/net/vchat/distinfo b/net/vchat/distinfo
deleted file mode 100644
index ac3f2eccf3c6..000000000000
--- a/net/vchat/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (vchat-2.42c.tar.gz) = a4f847d7804924f64b3b2012936847cb923a09954bbb0b019c0f2dfa13589db1
-SIZE (vchat-2.42c.tar.gz) = 121154
diff --git a/net/vchat/pkg-descr b/net/vchat/pkg-descr
deleted file mode 100644
index 0d2cd94f5f28..000000000000
--- a/net/vchat/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-VChat is a fully featured internet conferencing (or chat-) system with
-traditional commandline interface, support for ANSI colors, a builtin
-user management system with per user assignable permission sets, server side
-access control list support and a lot of other useful features. The open
-architecture of the system and a range of existing client software that
-suits most needs make it the ideal solution for setting up a conferencing
-system for your website or network.
-
-This port is the standard UNIX client software for taking part in VChat
-conferences. It also includes vchatd, a TELNET gateway that may be run from
-inetd, allowing to take part in VChat conferences by using a standard
-telnet client/terminal emulation.
-
-See net/vserver for the server side components of the VChat system.
-
-WWW: http://www.enforcer.cc/vchat/
diff --git a/net/vserver/Makefile b/net/vserver/Makefile
deleted file mode 100644
index 5594ba482527..000000000000
--- a/net/vserver/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by: Andreas Wetzel <mickey@netassembly.de>
-# $FreeBSD$
-
-PORTNAME=	vserver
-PORTVERSION=	2.43c
-CATEGORIES=	net
-MASTER_SITES=	http://www.enforcer.cc/vchat/filez/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Server software of the VChat conference system
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--prefix="${PREFIX}" --mandir="${PREFIX}/man"
-USE_RC_SUBR=	vserver
-
-MAN8=		vchatctl.8 vserver.8
-
-VCHATUSER=	vchat
-VCHATGROUP=	vchat
-
-SUB_FILES=	pkg-install pkg-deinstall
-SUB_LIST+=	VCHATUSER=${VCHATUSER} \
-		VCHATGROUP=${VCHATGROUP}
-
-PLIST_FILES=	sbin/vserver sbin/vchatctl \
-		"@dirrmtry etc/vchat"
-
-NO_STAGE=	yes
-pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-post-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.mk>
diff --git a/net/vserver/distinfo b/net/vserver/distinfo
deleted file mode 100644
index 36e0e441624f..000000000000
--- a/net/vserver/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (vserver-2.43c.tar.gz) = 0d3e998e32a51d3d3354e18463abcc5073285daaa7af6f7da18121205605346e
-SIZE (vserver-2.43c.tar.gz) = 236422
diff --git a/net/vserver/files/pkg-deinstall.in b/net/vserver/files/pkg-deinstall.in
deleted file mode 100644
index 0eab04e3dc3c..000000000000
--- a/net/vserver/files/pkg-deinstall.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-
-if [ "$2" != "POST-DEINSTALL" ]; then
-	exit 0
-fi
-
-PREFIX=${PKG_PREFIX:-%%PREFIX%%}
-VCHATUSER=%%VCHATUSER%%
-VCHATGROUP=%%VCHATGROUP%%
-
-if pw usershow "${VCHATUSER}" 2>/dev/null 1>&2; then
-
-	echo "To delete ${VCHATUSER} user permanently, use 'pw userdel \"${VCHATUSER}\"'"
-
-fi
-
-if [ -d "${PREFIX}/etc/vchat" ]; then
-
-
-	echo "If you do not intend to use this package any longer, please delete"
-	echo "the directory \"${PREFIX}/etc/vchat\" manually."
-
-fi
-
-exit 0
diff --git a/net/vserver/files/pkg-install.in b/net/vserver/files/pkg-install.in
deleted file mode 100644
index b13f0f092cde..000000000000
--- a/net/vserver/files/pkg-install.in
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /bin/sh
-
-PREFIX=${PKG_PREFIX:-%%PREFIX%%}
-
-VCHATUSER=%%VCHATUSER%%
-VCHATGROUP=%%VCHATGROUP%%
-UID=128
-GID=128
-PW="pw"
-CHOWN="chown"
-CHMOD="chmod"
-MKDIR="mkdir"
-
-
-if [ "$2" = "PRE-INSTALL" ]; then
-
-	if ! ${PW} groupshow ${VCHATGROUP} 2>/dev/null 1>&2; then
-
-		if ${PW} groupadd ${VCHATGROUP} -g $GID; then
-			echo "=> Added group \"${VCHATGROUP}\"."
-		else
-			echo "=> Adding group \"${VCHATGROUP}\" failed."
-			exit 1
-		fi
-	fi
-
-	if ! ${PW} usershow ${VCHATUSER} 2>/dev/null 1>&2; then
-
-		if ${PW} useradd ${VCHATUSER} -u $UID -g ${VCHATGROUP} -h - \
-			-s "/sbin/nologin" -d "/nonexistent" \
-			-c "VChat Conferencing System"; \
-		then
-
-			echo "=> Added user \"${VCHATUSER}\"."
-
-		else
-
-			echo "=> Adding user \"${VCHATUSER}\" failed."
-			exit 1
-
-		fi
-	fi
-
-elif [ "$2" = "POST-INSTALL" ]; then
-
-	if [ ! -d "${PREFIX}/etc/vchat" ]; then
-		${MKDIR} ${PREFIX}/etc/vchat || exit 1
-	fi
-
-	${CHOWN} ${VCHATUSER}:${VCHATGROUP} ${PREFIX}/etc/vchat
-	${CHMOD} 755 ${PREFIX}/etc/vchat
-
-	if [ ! -f "${PREFIX}/etc/vchat/user.db" ]; then
-
-
-cat << -EOT-
-
-****************************** IMPORTANT NOTE *******************************
-
-Before starting vserver into normal operations for the first time, you
-need to create an initial user database file "${PREFIX}/etc/vchat/user.db".
-
-This is accomplished by running the following command sequence:
-
-su -f -m ${VCHATUSER} -c "${PREFIX}/sbin/vserver /BASEDIR=${PREFIX}/etc/vchat /CREATEUDB"
-
-*****************************************************************************
-
--EOT-
-
-	else
-
-		${CHOWN} ${VCHATUSER}:${VCHATGROUP} ${PREFIX}/etc/vchat/user.db
-		${CHMOD} 600 ${PREFIX}/etc/vchat/user.db
-
-	fi
-
-fi
-
-exit 0
diff --git a/net/vserver/files/vserver.in b/net/vserver/files/vserver.in
deleted file mode 100644
index e57d4172b49f..000000000000
--- a/net/vserver/files/vserver.in
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# FreeBSD boot time start up script for vserver(8).
-#
-# PROVIDE: vserver
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable vserver:
-#
-# vserver_enable="YES"
-#
-# Additional commandline qualifiers to be passed to vserver(8) may
-# be specified in /etc/rc.conf by adding:
-#
-# vserver_flags="<your commandline qualifiers here>"
-#
-# See vserver(8) for a detailed description of vserver commandline qualifiers.
-#
-
-. /etc/rc.subr
-
-name=vserver
-rcvar=vserver_enable
-
-command=%%PREFIX%%/sbin/vserver
-required_files=%%PREFIX%%/etc/vchat/user.db
-
-# read settings, set default values
-
-load_rc_config "$name"
-: ${vserver_enable="NO"}
-: ${vserver_flags="/SYSLOG"}
-: ${vserver_user="vchat"}
-: ${vserver_group="vchat"}
-: ${vserver_pidfile="%%PREFIX%%/etc/vchat/vserver.pid"}
-
-command_args="/DETACH"
-
-run_rc_command "$1"
diff --git a/net/vserver/pkg-descr b/net/vserver/pkg-descr
deleted file mode 100644
index fa1f62d56ee0..000000000000
--- a/net/vserver/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-VChat is a fully featured internet conferencing (or chat-) system with
-traditional commandline interface, support for ANSI colors, a builtin
-user management system with per user assignable permission sets, server side
-access control list support and a lot of other useful features. The open
-architecture of the system and a range of existing client software that
-suits most needs make it the ideal solution for setting up a conferencing
-system for your website or network.
-
-This port is the standard UNIX server software suite for setting up a VChat
-conference system.
-
-See ports/net/vchat for the client side components of the VChat system.
-
-WWW: http://www.enforcer.cc/vchat/
diff --git a/net/wire/Makefile b/net/wire/Makefile
deleted file mode 100644
index de5c1ea3bcca..000000000000
--- a/net/wire/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# Created by: trasz <trasz@pin.if.uz.zgora.pl>
-# $FreeBSD$
-
-PORTNAME=	wire
-PORTVERSION=	1.1.3
-PORTREVISION=	3
-CATEGORIES=	net
-MASTER_SITES=	http://mirror.mcx2.org/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dhn
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Wire is a screen-oriented command line Wired client
-
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--libdir="${PREFIX}/lib" --includedir="${PREFIX}/include"
-
-USE_OPENSSL=	yes
-USES=		iconv gmake
-
-PLIST_FILES=	bin/wire
-
-MAN1=		wire.1
-
-#.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/lib/libreadline.so.6)
-LIB_DEPENDS+=	libreadline.so.6:${PORTSDIR}/devel/readline
-.endif
-
-#.include <bsd.port.post.mk>
-
-#TODO this is fucking dirty :(
-NO_STAGE=	yes
-do-build:
-	cd ${WRKSRC} ;${MAKE_CMD}
-
-.include <bsd.port.mk>
diff --git a/net/wire/distinfo b/net/wire/distinfo
deleted file mode 100644
index f37f2e45d6a5..000000000000
--- a/net/wire/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (wire-1.1.3.tar.gz) = d2e66377c0dd54028e1188b62c05845225e9e166cec0b5ea76cc0e6a96b681be
-SIZE (wire-1.1.3.tar.gz) = 339306
diff --git a/net/wire/pkg-descr b/net/wire/pkg-descr
deleted file mode 100644
index d619b2346b59..000000000000
--- a/net/wire/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Wired is an open, modern and free version of the BBS-style
-client/server system, providing chat, messaging and file
-transfers.
-
-Wire is a screen-oriented command line Wired client.
-It supports most Wired features, including file transfers.
-
-WWW:	http://www.zankasoftware.com/wired/wire/
diff --git a/net/wired-tracker/Makefile b/net/wired-tracker/Makefile
deleted file mode 100644
index 39e5643e149f..000000000000
--- a/net/wired-tracker/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# Created by: trasz <trasz@pin.if.uz.zgora.pl>
-# $FreeBSD$
-
-PORTNAME=	wired-tracker
-PORTVERSION=	1.0.2
-CATEGORIES=	net
-MASTER_SITES=	http://mirror.mcx2.org/
-DISTNAME=	wiredtracker-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Wired tracker
-
-# This is an artificial dependancy - net/wired and net/wired-tracker
-# use some common files, like wired/etc/resolv.conf.
-RUN_DEPENDS=	${LOCALBASE}/sbin/wired:${PORTSDIR}/net/wired
-
-WRKSRC=		${WRKDIR}/wired-tracker-${PORTVERSION}
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--libdir="${LOCALBASE}/lib" --includedir="${LOCALBASE}/include"
-USES=		gmake
-USE_RC_SUBR=	trackerd
-
-MAN1=		trackerdctl.1
-MAN5=		trackerd.conf.5
-MAN8=		trackerd.8
-
-NO_STAGE=	yes
-post-install:
-	@if [ ! -f ${PREFIX}/wired/etc/trackerd.conf ]; then \
-		${CP} -p ${PREFIX}/wired/etc/trackerd.conf.sample ${PREFIX}/wired/etc/trackerd.conf ; \
-	fi
-	@if [ ! -f ${PREFIX}/wired/categories ]; then \
-		${CP} -p ${PREFIX}/wired/categories.sample ${PREFIX}/wired/categories ; \
-	fi
-
-.include <bsd.port.mk>
diff --git a/net/wired-tracker/distinfo b/net/wired-tracker/distinfo
deleted file mode 100644
index 3cffb943600c..000000000000
--- a/net/wired-tracker/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (wiredtracker-1.0.2.tar.gz) = ae7d53952c1e2dded79acfa954e4aec0b13b2f4c834f9b5034a0f33e90331c8d
-SIZE (wiredtracker-1.0.2.tar.gz) = 318644
diff --git a/net/wired-tracker/files/patch-Makefile.in b/net/wired-tracker/files/patch-Makefile.in
deleted file mode 100644
index 581dd8b3032e..000000000000
--- a/net/wired-tracker/files/patch-Makefile.in
+++ /dev/null
@@ -1,89 +0,0 @@
---- Makefile.in.orig	2007-12-09 18:11:07.000000000 +0100
-+++ Makefile.in	2007-12-13 21:07:28.000000000 +0100
-@@ -13,8 +13,8 @@
- 
- WT_VERSION		= @WT_VERSION@
- WT_MAINTAINER	= @WT_MAINTAINER@
--WT_USER			= @WT_USER@
--WT_GROUP		= @WT_GROUP@
-+WT_USER			= wired
-+WT_GROUP		= wired
- 
- DISTFILES		= INSTALL LICENSE NEWS README Makefile Makefile.in \
- 				  config.guess config.status config.h.in config.sub configure \
-@@ -71,7 +71,7 @@
- 
- $(rundir)/trackerdctl: $(abs_top_srcdir)/trackerd/trackerdctl.in
- 	@test -d $(@D) || mkdir -p $(@D)
--	sed -e 's,@trackerddir\@,$(fake_prefix)/$(trackerddir),g' $< > $@
-+	sed -e 's,@trackerddir\@,$(fake_prefix)/$(trackerddir),g' -e 's,@prefix\@,$(prefix),g' $< > $@
- 	chmod +x $@
- 
- $(rundir)/etc/trackerd.conf: $(abs_top_srcdir)/trackerd/trackerd.conf.in
-@@ -95,57 +95,16 @@
- 		touch .update; \
- 	fi
- 
--	$(INSTALL) -m 755 -o $(WT_USER) -g $(WT_GROUP) -d $(installdir)/
--	$(INSTALL) -m 755 -o $(WT_USER) -g $(WT_GROUP) -d $(installdir)/etc/
--	$(INSTALL) -m 755 -o $(WT_USER) -g $(WT_GROUP) -d $(installdir)/tmp/
--
--	if [ ! -f $(installdir)/banlist ]; then \
--		$(INSTALL) -m 644 -o $(WT_USER) -g $(WT_GROUP) $(rundir)/banlist $(installdir)/; \
--	fi
--
--	if [ ! -f $(installdir)/categories ]; then \
--		$(INSTALL) -m 644 -o $(WT_USER) -g $(WT_GROUP) $(rundir)/categories $(installdir)/; \
--	fi
--
--	if [ ! -f $(installdir)/etc/trackerd.conf ]; then \
--		$(INSTALL) -m 644 -o $(WT_USER) -g $(WT_GROUP) $(rundir)/etc/trackerd.conf $(installdir)/etc/; \
--	fi
--	
--	$(INSTALL) -m 755 -o $(WT_USER) -g $(WT_GROUP) $(rundir)/trackerd $(installdir)/
--	$(INSTALL) -m 755 -o $(WT_USER) -g $(WT_GROUP) $(rundir)/trackerdctl $(installdir)/
--
--	if [ -f /etc/resolv.conf ]; then \
--		$(INSTALL) -m 644 -o $(WT_USER) -g $(WT_GROUP) /etc/resolv.conf $(installdir)/etc/; \
--	fi
--
--	@if [ -f .update ]; then \
--		echo ""; \
--		echo "Update complete!"; \
--		echo ""; \
--		echo "You should now run:"; \
--		echo "    $(installdir)/trackerdctl restart"; \
--		echo "to restart a running tracker."; \
--	else \
--		echo ""; \
--		echo "Installation complete!"; \
--		echo ""; \
--		echo "Remember to edit $(installdir)/etc/trackerd.conf if you want to make any changes before starting the tracker."; \
--		echo ""; \
--		echo "When you are done, run:"; \
--		echo "    $(installdir)/trackerdctl start"; \
--		echo "to start the tracker."; \
--	fi
--	
--	@rm -f .update
--
-+	$(INSTALL) -m 644 -o $(WT_USER) -g $(WT_GROUP) run/categories $(installdir)/categories.sample
-+	$(INSTALL) -m 644 -o $(WT_USER) -g $(WT_GROUP) run/etc/trackerd.conf $(installdir)/etc/trackerd.conf.sample
-+	$(INSTALL) -m 755 -o 0 -g 0 run/trackerd $(prefix)/sbin
-+	$(INSTALL) -m 755 -o 0 -g 0 run/trackerdctl $(prefix)/bin
-+ 
- install-man:
--	$(INSTALL) -m 755 -d $(mandir)/man1/
--	$(INSTALL) -m 644 $(abs_top_srcdir)/man/trackerdctl.1 $(mandir)/man1/
--	$(INSTALL) -m 755 -d $(mandir)/man5/
--	$(INSTALL) -m 644 $(abs_top_srcdir)/man/trackerd.conf.5 $(mandir)/man5/
--	$(INSTALL) -m 755 -d $(mandir)/man8/
--	$(INSTALL) -m 644 $(abs_top_srcdir)/man/trackerd.8 $(mandir)/man8/
--
-+	$(INSTALL) -m 644 -o root -g wheel man/trackerdctl.1 $(mandir)/man1/
-+	$(INSTALL) -m 644 -o root -g wheel man/trackerd.conf.5 $(mandir)/man5/
-+	$(INSTALL) -m 644 -o root -g wheel man/trackerd.8 $(mandir)/man8/
-+ 
- dist:
- 	rm -rf wired-tracker-$(WT_VERSION)
- 	rm -f wired-tracker-$(WT_VERSION).tar.gz
diff --git a/net/wired-tracker/files/patch-configure b/net/wired-tracker/files/patch-configure
deleted file mode 100644
index b193f5630a3b..000000000000
--- a/net/wired-tracker/files/patch-configure
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.orig	2009-03-09 17:52:11.000000000 +0100
-+++ configure	2009-03-10 21:32:32.000000000 +0100
-@@ -6791,12 +6791,12 @@
- 		OLD_LIBS="$LIBS"
- 
- 	if test -z "$LIBS"; then
--		LIBS="-lpthread"
-+		LIBS="-pthread"
- 	else
--		MATCH=`expr -- "$LIBS" : ".*-lpthread"`
-+		MATCH=`expr -- "$LIBS" : ".*-pthread"`
- 
- 		if test "$MATCH" = "0"; then
--			LIBS="$LIBS -lpthread"
-+			LIBS="$LIBS -pthread"
- 		fi
- 	fi
- 
-@@ -6936,7 +6936,7 @@
- 
- 		if test "$wi_pthreads_test" = "yes"; then
- 			wi_pthreads_found="yes"
--			wi_pthreads_libs="-lpthread"
-+			wi_pthreads_libs="-pthread"
- 		fi
- 	fi
- 
diff --git a/net/wired-tracker/files/patch-trackerd-trackerdctl.in b/net/wired-tracker/files/patch-trackerd-trackerdctl.in
deleted file mode 100644
index cffb137ce3fe..000000000000
--- a/net/wired-tracker/files/patch-trackerd-trackerdctl.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- trackerd/trackerdctl.in.orig	Sat Dec  2 01:27:04 2006
-+++ trackerd/trackerdctl.in	Sat Dec  2 01:27:49 2006
-@@ -13,7 +13,7 @@
- CERTIFICATE="@trackerddir@/etc/certificate.pem"
- 
- # The path to your trackerd binary
--TRACKERD="@trackerddir@/trackerd"
-+TRACKERD="@prefix@/sbin/trackerd"
- 
- # Flags to pass to trackerd
- TRACKERDFLAGS="-d @trackerddir@ -ll -u"
diff --git a/net/wired-tracker/files/trackerd.in b/net/wired-tracker/files/trackerd.in
deleted file mode 100644
index e7c83b8e6924..000000000000
--- a/net/wired-tracker/files/trackerd.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# PROVIDE: trackerd
-# REQUIRE: 
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# trackerd_enable (bool):   Set to NO by default.
-#               Set it to YES to enable trackerd.
-#
-
-. /etc/rc.subr
-
-name="trackerd"
-rcvar=trackerd_enable
-
-pidfile=%%PREFIX%%/wired/trackerd.pid
-command=%%PREFIX%%/sbin/${name}
-
-load_rc_config $name
-
-: ${trackerd_enable="NO"}
-
-run_rc_command "$1"
diff --git a/net/wired-tracker/pkg-descr b/net/wired-tracker/pkg-descr
deleted file mode 100644
index 64f8ee9dd065..000000000000
--- a/net/wired-tracker/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Wired Tracker is the Wired tracker server. Wired servers can register
-with the tracker with their name, URL and some other vitals, and
-clients connecting to the tracker will be able to retrieve a listing
-of all online servers.
-
-WWW:	http://www.zankasoftware.com/wired/tracker/
diff --git a/net/wired-tracker/pkg-plist b/net/wired-tracker/pkg-plist
deleted file mode 100644
index 4ed84c50a005..000000000000
--- a/net/wired-tracker/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-@unexec if cmp -s %D/wired/etc/trackerd.conf.sample %D/wired/etc/trackerd.conf; then rm -f %D/wired/etc/trackerd.conf; fi
-wired/etc/trackerd.conf.sample
-@exec if [ ! -f %D/wired/etc/trackerd.conf ] ; then cp -p %D/%F %B/trackerd.conf; fi
-@unexec if cmp -s %D/wired/categories.sample %D/wired/categories; then rm -f %D/wired/categories; fi
-wired/categories.sample
-@exec if [ ! -f %D/wired/categories ] ; then cp -p %D/%F %B/categories; fi
-sbin/trackerd
-bin/trackerdctl
diff --git a/net/wired/Makefile b/net/wired/Makefile
deleted file mode 100644
index 74f60d5cbec6..000000000000
--- a/net/wired/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Created by: trasz <trasz@pin.if.uz.zgora.pl>
-# $FreeBSD$
-
-PORTNAME=	wired
-PORTVERSION=	1.3.4
-PORTREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	http://mirror.mcx2.org/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Wired server
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--libdir="${LOCALBASE}/lib" --includedir="${LOCALBASE}/include"
-USES=		gmake
-USE_RC_SUBR=	wired
-
-MAN1=		wiredctl.1
-MAN5=		wired.conf.5
-MAN8=		wired.8
-
-NO_STAGE=	yes
-pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-post-install:
-.for i in etc/wired.conf etc/resolv.conf banlist groups news users
-	@if [ ! -f ${PREFIX}/wired/${i} ]; then \
-		${CP} -p ${PREFIX}/wired/${i}.sample ${PREFIX}/wired/${i} ; \
-	fi
-.endfor
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.mk>
diff --git a/net/wired/distinfo b/net/wired/distinfo
deleted file mode 100644
index d37c96f7927c..000000000000
--- a/net/wired/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (wired-1.3.4.tar.gz) = ed4d9492fd057dfc41c33a8bd80b8923b9e3061fd0ba6445b246307d0ffb2989
-SIZE (wired-1.3.4.tar.gz) = 369661
diff --git a/net/wired/files/patch-Makefile.in b/net/wired/files/patch-Makefile.in
deleted file mode 100644
index 4153a1d9846d..000000000000
--- a/net/wired/files/patch-Makefile.in
+++ /dev/null
@@ -1,99 +0,0 @@
---- Makefile.in.orig	2007-12-09 18:11:00.000000000 +0100
-+++ Makefile.in	2007-12-13 20:54:54.000000000 +0100
-@@ -13,8 +13,8 @@
- 
- WD_VERSION		= @WD_VERSION@
- WD_MAINTAINER	= @WD_MAINTAINER@
--WD_USER			= @WD_USER@
--WD_GROUP		= @WD_GROUP@
-+WD_USER			= wired
-+WD_GROUP		= wired
- 
- DISTFILES		= INSTALL LICENSE NEWS README Makefile Makefile.in \
- 				  config.guess config.status config.h.in config.sub configure \
-@@ -71,7 +71,7 @@
- 
- $(rundir)/wiredctl: $(abs_top_srcdir)/wired/wiredctl.in
- 	@test -d $(@D) || mkdir -p $(@D)
--	sed -e 's,@wireddir\@,$(fake_prefix)/$(wireddir),g' $< > $@
-+	sed -e 's,@wireddir\@,$(fake_prefix)/$(wireddir),g' -e 's,@prefix\@,$(prefix),g' $< > $@
- 	chmod +x $@
- 
- $(rundir)/etc/wired.conf: $(abs_top_srcdir)/wired/wired.conf.in
-@@ -91,10 +91,6 @@
- install-only: install-man install-wired
- 
- install-wired:
--	@if [ -e $(installdir)/wired ]; then \
--		touch .update; \
--	fi
--
- 	$(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) -d $(installdir)/
- 	$(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) -d $(installdir)/etc/
- 	$(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) -d $(installdir)/tmp/
-@@ -109,55 +105,16 @@
- 		$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/files/Drop\ Box/.wired/type $(installdir)/files/Drop\ Box/.wired/; \
- 	fi
- 
--	if [ ! -f $(installdir)/banlist ]; then \
--		$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/banlist $(installdir)/; \
--	fi
--
--	if [ ! -f $(installdir)/groups ]; then \
--		$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/groups $(installdir)/; \
--	fi
--
--	if [ ! -f $(installdir)/news ]; then \
--		$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/news $(installdir)/; \
--	fi
--
--	if [ ! -f $(installdir)/users ]; then \
--		$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/users $(installdir)/; \
--	fi
--
--	if [ ! -f $(installdir)/etc/wired.conf ]; then \
--		$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/etc/wired.conf $(installdir)/etc/; \
--	fi
--
--	$(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/wired $(installdir)/
--	$(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/wiredctl $(installdir)/
--
--	if [ -f /etc/resolv.conf ]; then \
--		$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) /etc/resolv.conf $(installdir)/etc/; \
--	fi
--
--	@if [ -f .update ]; then \
--		echo ""; \
--		echo "Update complete!"; \
--		echo ""; \
--		echo "You should now run:"; \
--		echo "    $(installdir)/wiredctl restart"; \
--		echo "to restart a running server."; \
--	else \
--		echo ""; \
--		echo "Installation complete!"; \
--		echo ""; \
--		echo "An administrator account with login \"admin\" and no password has been created."; \
--		echo ""; \
--		echo "Remember to edit $(installdir)/etc/wired.conf if you want to make any changes before starting the server."; \
--		echo ""; \
--		echo "When you are done, run:"; \
--		echo "    $(installdir)/wiredctl start"; \
--		echo "to start the server."; \
--	fi
--
--	@rm -f .update
--
-+	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/banlist $(installdir)/banlist.sample
-+	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/groups $(installdir)/groups.sample
-+	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/news $(installdir)/news.sample
-+	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/users $(installdir)/users.sample
-+	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/etc/wired.conf $(installdir)/etc/wired.conf.sample
-+	$(INSTALL) -m 755 -o 0 -g 0 $(rundir)/wired $(prefix)/sbin/
-+	$(INSTALL) -m 755 -o 0 -g 0 $(rundir)/wiredctl $(prefix)/bin/
-+
-+	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) /etc/resolv.conf $(installdir)/etc/resolv.conf.sample
-+
- install-man:
- 	$(INSTALL) -m 755 -d $(mandir)/man1/
- 	$(INSTALL) -m 644 $(abs_top_srcdir)/man/wiredctl.1 $(mandir)/man1/
diff --git a/net/wired/files/patch-wired-wiredctl.in b/net/wired/files/patch-wired-wiredctl.in
deleted file mode 100644
index cd1509b31b6d..000000000000
--- a/net/wired/files/patch-wired-wiredctl.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- wired/wiredctl.in.orig	Thu Nov 23 19:59:48 2006
-+++ wired/wiredctl.in	Thu Nov 23 20:00:58 2006
-@@ -13,7 +13,7 @@
- CERTIFICATE="@wireddir@/etc/certificate.pem"
- 
- # The path to your wired binary
--WIRED="@wireddir@/wired"
-+WIRED="@prefix@/sbin/wired"
- 
- # Flags to pass to wired
- WIREDFLAGS="-d @wireddir@ -ll -u"
diff --git a/net/wired/files/wired.in b/net/wired/files/wired.in
deleted file mode 100644
index a2ede8076392..000000000000
--- a/net/wired/files/wired.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# PROVIDE: wired
-# REQUIRE: 
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# wired_enable (bool):   Set to NO by default.
-#               Set it to YES to enable wired.
-#
-
-. /etc/rc.subr
-
-name="wired"
-rcvar=wired_enable
-
-pidfile=%%PREFIX%%/wired/wired.pid
-command=%%PREFIX%%/sbin/${name}
-
-load_rc_config $name
-
-: ${wired_enable="NO"}
-
-run_rc_command "$1"
diff --git a/net/wired/pkg-deinstall b/net/wired/pkg-deinstall
deleted file mode 100644
index ba3037ac19da..000000000000
--- a/net/wired/pkg-deinstall
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-#
-# ex:ts=4
-
-ask() {
-	local question default answer
-
-	question=$1
-	default=$2
-	if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
-		read -p "${question} [${default}]? " answer
-	fi
-	echo ${answer:-${default}}
-}
-
-yesno() {
-	local question default answer
-
-	question=$1
-	default=$2
-	while :; do
-		answer=$(ask "${question}" "${default}")
-		case "${answer}" in
-		[Yy]*)	return 0;;
-		[Nn]*)	return 1;;
-		esac
-		echo "Please answer yes or no."
-	done
-}
-
-delete_account() {
-	local u
-
-	u=$1
-	if yesno "Do you want me to remove user \"${u}\"" n; then
-		pw userdel -n ${u}
-		echo "Done."
-	fi
-}
-
-case $2 in
-
-DEINSTALL)
-	if ps -axc | grep -qw wired; then
-		if yesno "Wired is still running. Shall I stop it?" y; then
-			killall wired
-			sleep 2
-		else
-			echo "OK ... I hope you know what you are doing."
-		fi
-	fi
-
-	delete_account wired
-	;;
-
-esac
diff --git a/net/wired/pkg-descr b/net/wired/pkg-descr
deleted file mode 100644
index 441dd35d859d..000000000000
--- a/net/wired/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Wired is an open, modern and free version of the BBS-style
-client/server system, providing chat, messaging and file
-transfers.
-
-WWW:	http://www.zankasoftware.com/wired/
diff --git a/net/wired/pkg-install b/net/wired/pkg-install
deleted file mode 100644
index 35af862613ac..000000000000
--- a/net/wired/pkg-install
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-#
-# ex:ts=4
-
-ask() {
-	local question default answer
-
-	question=$1
-	default=$2
-	if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
-		read -p "${question} [${default}]? " answer
-	fi
-	echo ${answer:-${default}}
-}
-
-yesno() {
-	local question default answer
-
-	question=$1
-	default=$2
-	while :; do
-		answer=$(ask "${question}" "${default}")
-		case "${answer}" in
-		[Yy]*)	return 0;;
-		[Nn]*)	return 1;;
-		esac
-		echo "Please answer yes or no."
-	done
-}
-
-make_account() {
-	local u g gcos
-
-	u=$1
-	g=$2
-	gcos=$3
-
-	if pw group show "${g}" >/dev/null 2>&1; then
-		echo "You already have a group \"${g}\", so I will use it."
-	else
-		echo "You need a group \"${g}\"."
-		if which -s pw && yesno "Would you like me to create it" y
-		then
-			pw groupadd ${g} || exit
-			echo "Done."
-		else
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-    
-	if pw user show "${u}" >/dev/null 2>&1; then
-		echo "You already have a user \"${u}\", so I will use it."
-	else
-		echo "You need a user \"${u}\"."
-		if which -s pw && yesno "Would you like me to create it" y
-		then
-			pw useradd ${u} -g ${g} -c "${gcos}" -d /nonexistent -s /sbin/nologin -h - || exit
-			echo "Done."
-		else
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-}
-
-case $2 in
-
-PRE-INSTALL)
-	make_account wired wired "Wired server"
-	;;
-
-POST-INSTALL)
-	openssl req -batch -new -x509 -nodes -out ${PKG_PREFIX}/wired/etc/certificate.pem.sample -keyout ${PKG_PREFIX}/wired/etc/certificate.pem.sample;
-
-	# We have to do this here instead of @exec in pkg-plist, because @exec clause
-	# is executed before POST-INSTALL, which creates the certificate.pem.sample.
-	if [ ! -f ${PKG_PREFIX}/wired/etc/certificate.pem ]; then
-		cp -p ${PKG_PREFIX}/wired/etc/certificate.pem.sample ${PKG_PREFIX}/wired/etc/certificate.pem;
-	fi
-	;;
-
-esac
diff --git a/net/wired/pkg-plist b/net/wired/pkg-plist
deleted file mode 100644
index 4bedb7278d17..000000000000
--- a/net/wired/pkg-plist
+++ /dev/null
@@ -1,35 +0,0 @@
-@unexec if cmp -s %D/wired/etc/certificate.pem.sample %D/wired/etc/certificate.pem; then rm -f %D/wired/etc/certificate.pem; fi
-@comment The file below gets created by pkg-install script, so there is no point
-@comment in putting it into plist.
-@unexec rm -f %D/wired/etc/certificate.pem.sample
-@unexec if cmp -s %D/wired/etc/wired.conf.sample %D/wired/etc/wired.conf; then rm -f %D/wired/etc/wired.conf; fi
-wired/etc/wired.conf.sample
-@exec if [ ! -f %D/wired/etc/wired.conf ] ; then cp -p %D/%F %B/wired.conf; fi
-@unexec if cmp -s %D/wired/etc/resolv.conf.sample %D/wired/etc/resolv.conf; then rm -f %D/wired/etc/resolv.conf; fi
-wired/etc/resolv.conf.sample
-@exec if [ ! -f %D/wired/etc/resolv.conf ] ; then cp -p %D/%F %B/resolv.conf; fi
-wired/files/Uploads/.wired/type
-wired/files/Drop Box/.wired/type
-@unexec if cmp -s %D/wired/banlist.sample %D/wired/banlist; then rm -f %D/wired/banlist; fi
-wired/banlist.sample
-@exec if [ ! -f %D/wired/banlist ] ; then cp -p %D/%F %B/banlist; fi
-@unexec if cmp -s %D/wired/groups.sample %D/wired/groups; then rm -f %D/wired/groups; fi
-wired/groups.sample
-@exec if [ ! -f %D/wired/groups ] ; then cp -p %D/%F %B/groups; fi
-@unexec if cmp -s %D/wired/news.sample %D/wired/news; then rm -f %D/wired/news; fi
-wired/news.sample
-@exec if [ ! -f %D/wired/news ] ; then cp -p %D/%F %B/news; fi
-@unexec if cmp -s %D/wired/users.sample %D/wired/users; then rm -f %D/wired/users; fi
-wired/users.sample
-@exec if [ ! -f %D/wired/users ] ; then cp -p %D/%F %B/users; fi
-sbin/wired
-bin/wiredctl
-@exec mkdir -p %D/wired/tmp
-@dirrmtry wired/tmp
-@dirrmtry wired/files/Uploads/.wired
-@dirrmtry wired/files/Uploads
-@dirrmtry wired/files/Drop Box/.wired
-@dirrmtry wired/files/Drop Box
-@dirrmtry wired/files
-@dirrmtry wired/etc
-@dirrmtry wired
diff --git a/net/xbone/Makefile b/net/xbone/Makefile
deleted file mode 100644
index 90bf80293f1d..000000000000
--- a/net/xbone/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# Created by: Yu-Shun Wang <xbone@isi.edu>
-# $FreeBSD$
-
-PORTNAME=	XBone
-PORTVERSION=	3.2
-PORTREVISION=	7
-CATEGORIES=	net perl5
-MASTER_SITES=	http://www.isi.edu/xbone/software/xbone/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Deploys and manages IP-based VPNs (aka "virtual Internets")
-
-BUILD_DEPENDS=	p5-AppConfig>=0:${PORTSDIR}/devel/p5-AppConfig \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-IO-Socket-Multicast>=0:${PORTSDIR}/net/p5-IO-Socket-Multicast \
-		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		p5-IO-Socket-Multicast>=0.25:${PORTSDIR}/net/p5-IO-Socket-Multicast \
-		p5-IO-Socket-Multicast6>=0:${PORTSDIR}/net/p5-IO-Socket-Multicast6 \
-		p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager \
-		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-Graph>=0:${PORTSDIR}/math/p5-Graph \
-		p5-NetAddr-IP>0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
-		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-Mail-Sendmail>=0:${PORTSDIR}/mail/p5-Mail-Sendmail \
-		p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6 \
-		p5-Net-SSH-Perl>=0:${PORTSDIR}/net/p5-Net-SSH-Perl \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \
-		p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk \
-		p5-Tk-Getopt>=0:${PORTSDIR}/x11-toolkits/p5-Tk-Getopt \
-		p5-Tk-TableMatrix>=0:${PORTSDIR}/x11-toolkits/p5-Tk-TableMatrix
-
-#IS_INTERACTIVE=	yes
-NO_BUILD=	yes
-USES=		perl5 gmake
-USE_OPENLDAP=	yes
-
-INSTALL_TARGET=	node
-
-MAN5=		XB_Params.pm.5 xbone.conf.5
-MAN8=		X-Bone.8 xb-node-daemon.8 xb-node-control.8 xbonectl.8 xb-ldap-config.8
-
-NO_STAGE=	yes
-post-patch:
-	${RM} -rf ${WRKSRC}/ports/*
-
-.include <bsd.port.mk>
diff --git a/net/xbone/distinfo b/net/xbone/distinfo
deleted file mode 100644
index e14000e360b6..000000000000
--- a/net/xbone/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (XBone-3.2.tar.gz) = 8e67c6b7facd299ee960a4f2103cc3fb175f6ae3729509248f421478ec9373ea
-SIZE (XBone-3.2.tar.gz) = 663309
diff --git a/net/xbone/pkg-descr b/net/xbone/pkg-descr
deleted file mode 100644
index d94f77de1428..000000000000
--- a/net/xbone/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-The X-Bone dynamically deploys and manages Internet overlays to reduce
-configuration effort and increase network component sharing. The
-X-Bone discovers, configures, and monitors network resources to create
-overlays over existing IP networks. Overlays are useful for deploying
-overlapping virtual networks on shared infrastructure and for
-simplifying topology.
-
-The X-Bone's two-layer IP in IP tunneled overlays support existing
-applications and unmodified routing, multicast, and DNS services in
-unmodified host operating systems. This two-layer scheme uniquely
-supports node revisitation and recursive overlays, which is critical
-for fault tolerance and dynamic relocation. The X-Bone uses multicast
-to simplify resource discovery, and provides secure deployment as well
-as secure overlays (VPNs).
-
-WWW:	http://www.isi.edu/xbone/
diff --git a/net/xbone/pkg-plist b/net/xbone/pkg-plist
deleted file mode 100644
index b762b45d1230..000000000000
--- a/net/xbone/pkg-plist
+++ /dev/null
@@ -1,294 +0,0 @@
-bin/xbonectl
-etc/xbone/cert/CAcert.pem
-etc/xbone/cert/README
-etc/xbone/xbone.sh.sample
-etc/xbone/xbone.conf.sample
-etc/xbone/openldap/README
-etc/xbone/openldap/slapd-xbone.conf.template
-etc/xbone/openldap/slave-acl.conf
-etc/xbone/openldap/slave-init-local.ldif
-etc/xbone/openldap/slave-init-global.ldif
-etc/xbone/openldap/xbone-ldap-local.ldif
-etc/xbone/openldap/xbone-ldap-global.ldif
-etc/xbone/openldap/xb-ldap-config.pl
-etc/xbone/openldap/xbone.schema
-etc/xbone/named/xbone/xbone-forward.zone
-etc/xbone/named/xbone/xbone-reverse.zone
-etc/xbone/named/xbone/xbone-reverse6.zone
-etc/xbone/named/named.conf
-etc/xbone/named/resolv.conf
-etc/xbone/routing/ripd.conf.sample
-etc/xbone/routing/ripngd.conf.sample
-etc/xbone/routing/zebra.conf.sample
-xbone/doc/v6/Linux-v6-status.txt
-xbone/doc/v6/modules.README
-xbone/doc/v6/xbone-v6-support.txt
-xbone/doc/README
-xbone/doc/api-language.doc
-xbone/doc/dynamic_dns.txt
-xbone/doc/mrouted.conf.example
-xbone/doc/xbone-QoS-support.txt
-xbone/doc/xbone-acl-rules.txt
-xbone/doc/xbone-app-deployment.txt
-xbone/doc/xbone-ca-setup.txt
-xbone/doc/xbone-cisco-support.txt
-xbone/doc/xbone-control-protocol.txt
-xbone/doc/xbone-custom-topology.txt
-xbone/doc/xbone-data-structure.txt
-xbone/doc/xbone-dynamic-routing.txt
-xbone/doc/xbone-ipsec-conf.txt
-xbone/doc/xbone-networking-req.txt
-xbone/doc/xbone-ldap.txt
-xbone/apps/prm/webvis/gen.pl
-xbone/apps/prm/webvis/index.html
-xbone/apps/prm/webvis/title-bg.png
-xbone/apps/prm/webvis/webvis.css
-xbone/apps/prm/webvis/webvis.svg
-xbone/apps/prm/Divert.pm
-xbone/apps/prm/HTTP.pm
-xbone/apps/prm/IPIP.pm
-xbone/apps/prm/Mux.pm
-xbone/apps/prm/Tun.pm
-xbone/apps/prm/Utilities.pm
-xbone/apps/prm/BARP.pm
-xbone/apps/prm/barp.example
-xbone/apps/prm/dump.pl
-xbone/apps/prm/innerlay
-xbone/apps/prm/outerlay
-xbone/apps/prm/prm.pl
-xbone/apps/prm/tg.sh
-xbone/apps/prm/barp-table.pl
-xbone/apps/test-script/README.v1
-xbone/apps/test-script/xbone-test.conf
-xbone/apps/test-script/xbone-test.sh
-xbone/apps/README.abone
-xbone/apps/abone-script
-xbone/apps/sample-app-deploy-script.sh
-xbone/apps/vserver-script.pl
-xbone/conf/named/xbone/xbone-forward.zone
-xbone/conf/named/xbone/xbone-reverse.zone
-xbone/conf/named/xbone/xbone-reverse6.zone
-xbone/conf/named/named.conf
-xbone/conf/named/resolv.conf
-xbone/conf/routing/ripd.conf.sample
-xbone/conf/routing/ripngd.conf.sample
-xbone/conf/routing/zebra.conf.sample
-xbone/conf/apache/README
-xbone/conf/apache/xb-apache-config.pl
-xbone/conf/apache/xbone-apache.conf.template
-xbone/conf/openldap/README
-xbone/conf/openldap/slapd-xbone.conf.template
-xbone/conf/openldap/slave-acl.conf
-xbone/conf/openldap/slave-init-local.ldif
-xbone/conf/openldap/slave-init-global.ldif
-xbone/conf/openldap/xbone-ldap-local.ldif
-xbone/conf/openldap/xbone-ldap-global.ldif
-xbone/conf/openldap/xb-ldap-config.pl
-xbone/conf/openldap/xbone.schema
-xbone/conf/cert/CAcert.pem
-xbone/conf/cert/README
-xbone/conf/xbone.conf.sample
-xbone/conf/xbone.sh.sample
-xbone/man/man5/XB_Params.pm.5
-xbone/man/man5/xbone-gui.conf.5
-xbone/man/man5/xbone.conf.5
-xbone/man/man8/X-Bone.8
-xbone/man/man8/xb-gui-control.8
-xbone/man/man8/xb-node-control.8
-xbone/man/man8/xb-node-daemon.8
-xbone/man/man8/xb-ldap-config.8
-xbone/man/man8/xb-apache-config.8
-xbone/man/man8/xbonectl.8
-xbone/programs/modules/cpan/IO/Socket/SSLv6.pm
-xbone/programs/modules/cpan/Net/IP/XB_IP.pm
-xbone/programs/modules/XB_API_OM.pm
-xbone/programs/modules/XB_API_SUBS.pm
-xbone/programs/modules/XB_API_grammar.pm
-xbone/programs/modules/XB_API_parser.pm
-xbone/programs/modules/XB_AppCmds.pm
-xbone/programs/modules/XB_AppDeploy.pm
-xbone/programs/modules/XB_CTL_parser.pm
-xbone/programs/modules/XB_Cisco.pm
-xbone/programs/modules/XB_CiscoSSH.pm
-xbone/programs/modules/XB_Common.pm
-xbone/programs/modules/XB_Defs.pm
-xbone/programs/modules/XB_Dummynet.pm
-xbone/programs/modules/XB_IPsec.pm
-xbone/programs/modules/XB_LDAP.pm
-xbone/programs/modules/XB_Log.pm
-xbone/programs/modules/XB_Route.pm
-xbone/programs/modules/XB_SMIME.pm
-xbone/programs/modules/XB_Tunnel.pm
-xbone/programs/modules/XB_Utils.pm
-xbone/programs/modules/XB_VN_DNS.pm
-xbone/programs/modules/XB_VN_Graph.pm
-xbone/programs/modules/XB_VN_IPalloc.pm
-xbone/programs/modules/XB_VN_funcs.pm
-xbone/programs/modules/XB_XML_GUI.pm
-xbone/programs/modules/XB_XML_scan.pm
-xbone/programs/modules/XB_XOL.pm
-xbone/programs/modules/XB_Zebra.pm
-xbone/programs/modules/api-1.0.dtd
-xbone/programs/modules/api-2.0.dtd
-xbone/programs/modules/XB_API_GUI.pm
-xbone/programs/modules/zebractl
-xbone/programs/XB_CTL.pm
-xbone/programs/XB_Params.pm
-xbone/programs/XB_API.pm
-xbone/programs/xb-node-daemon.pl
-xbone/programs/xbonectl.pl
-xbone/programs/xb-api-client.pl
-xbone/www/htdocs/images/zoom.png
-xbone/www/htdocs/images/background_light_tan.gif
-xbone/www/htdocs/images/background_med_tan.gif
-xbone/www/htdocs/images/background_tan.gif
-xbone/www/htdocs/images/background_tan.jpg
-xbone/www/htdocs/images/face.gif
-xbone/www/htdocs/images/face.png
-xbone/www/htdocs/images/h1.gif
-xbone/www/htdocs/images/h2.gif
-xbone/www/htdocs/images/h3.gif
-xbone/www/htdocs/images/h4.gif
-xbone/www/htdocs/images/h5.gif
-xbone/www/htdocs/images/h6.gif
-xbone/www/htdocs/images/h7.gif
-xbone/www/htdocs/images/h8.gif
-xbone/www/htdocs/images/linear.gif
-xbone/www/htdocs/images/link.gif
-xbone/www/htdocs/images/link.png
-xbone/www/htdocs/images/main_background.gif
-xbone/www/htdocs/images/new-ovl.gif
-xbone/www/htdocs/images/new-ovl.png
-xbone/www/htdocs/images/overlays.png
-xbone/www/htdocs/images/ring.gif
-xbone/www/htdocs/images/stag.gif
-xbone/www/htdocs/images/star.gif
-xbone/www/htdocs/images/tree.gif
-xbone/www/htdocs/images/zoom.gif
-xbone/www/htdocs/images/background.gif
-xbone/www/htdocs/index.html
-xbone/www/htdocs/robots.txt
-xbone/www/htdocs/xbone.css
-xbone/www/lib/XB_Common.pm
-xbone/www/s-cgi-bin/xb-xml-status.pl
-xbone/www/s-cgi-bin/mroutedctl.pl
-xbone/www/s-cgi-bin/xb-create-dynabone.pl
-xbone/www/s-cgi-bin/xb-mcast-conf.pl
-xbone/www/s-cgi-bin/xb-req-host-cert.pl
-xbone/www/s-cgi-bin/xb-xml-admin.pl
-xbone/www/s-cgi-bin/xb-xml-create.pl
-xbone/www/s-cgi-bin/xb-xml-destroy.pl
-xbone/www/s-cgi-bin/xb-xml-discover.pl
-xbone/www/s-cgi-bin/xb-xml-index.pl
-xbone/www/s-cgi-bin/XB_XML_Interface.pm
-xbone/www/s-htdocs/xml/images/zoom.png
-xbone/www/s-htdocs/xml/images/background_light_tan.gif
-xbone/www/s-htdocs/xml/images/background_med_tan.gif
-xbone/www/s-htdocs/xml/images/background_tan.gif
-xbone/www/s-htdocs/xml/images/background_tan.jpg
-xbone/www/s-htdocs/xml/images/face.gif
-xbone/www/s-htdocs/xml/images/face.png
-xbone/www/s-htdocs/xml/images/h1.gif
-xbone/www/s-htdocs/xml/images/h2.gif
-xbone/www/s-htdocs/xml/images/h3.gif
-xbone/www/s-htdocs/xml/images/h4.gif
-xbone/www/s-htdocs/xml/images/h5.gif
-xbone/www/s-htdocs/xml/images/h6.gif
-xbone/www/s-htdocs/xml/images/h7.gif
-xbone/www/s-htdocs/xml/images/h8.gif
-xbone/www/s-htdocs/xml/images/linear.gif
-xbone/www/s-htdocs/xml/images/link.gif
-xbone/www/s-htdocs/xml/images/link.png
-xbone/www/s-htdocs/xml/images/main_background.gif
-xbone/www/s-htdocs/xml/images/new-ovl.gif
-xbone/www/s-htdocs/xml/images/new-ovl.png
-xbone/www/s-htdocs/xml/images/overlays.png
-xbone/www/s-htdocs/xml/images/ring.gif
-xbone/www/s-htdocs/xml/images/stag.gif
-xbone/www/s-htdocs/xml/images/star.gif
-xbone/www/s-htdocs/xml/images/tree.gif
-xbone/www/s-htdocs/xml/images/zoom.gif
-xbone/www/s-htdocs/xml/images/background.gif
-xbone/www/s-htdocs/xml/cookie.js
-xbone/www/s-htdocs/xml/create-reply-xsl.xml
-xbone/www/s-htdocs/xml/create-xsl.xml
-xbone/www/s-htdocs/xml/destroy-xsl.xml
-xbone/www/s-htdocs/xml/discover-reply-xsl.xml
-xbone/www/s-htdocs/xml/discover-xsl.xml
-xbone/www/s-htdocs/xml/admin-xsl.xml
-xbone/www/s-htdocs/xml/index-xsl.xml
-xbone/www/s-htdocs/xml/notes.html
-xbone/www/s-htdocs/xml/status-reply-xsl.xml
-xbone/www/s-htdocs/xml/status-xsl.xml
-xbone/www/s-htdocs/xml/xbone.css
-xbone/www/s-htdocs/xml/error-xsl.xml
-xbone/www/s-htdocs/index.html
-xbone/www/s-htdocs/robots.txt
-xbone/www/xb-cgi-bin/xb-get-ca-cert.pl
-xbone/www/xb-cgi-bin/xb-index.pl
-xbone/www/xb-cgi-bin/xb-redirect.pl
-xbone/www/xb-cgi-bin/xb-req-user-cert.pl
-xbone/install/patches/linux/ipip.c.patch71
-xbone/install/patches/linux/ipip.c.patch72
-xbone/install/patches/openldap/README
-xbone/install/patches/openldap/patch-multimaster
-xbone/install/FILELIST
-xbone/install/INSTALL
-xbone/install/Makefile
-xbone/install/QuickInstall
-xbone/install/README
-xbone/install/REQUIREMENTS
-xbone/install/perl-module-install.sh
-xbone/install/xb-gui-control.pl
-xbone/install/xb-node-control.pl
-xbone/install/CHANGES
-xbone/install/COPYRIGHT
-xbone/install/FAQ
-bin/xb-api-client
-bin/xb-ldap-config
-bin/xb-node-control
-bin/xb-node-daemon
-@dirrm etc/xbone/cert
-@dirrm etc/xbone/openldap
-@dirrm etc/xbone/named/xbone
-@dirrm etc/xbone/named
-@dirrm etc/xbone/routing
-@dirrm etc/xbone
-@dirrm xbone/doc/v6
-@dirrm xbone/doc
-@dirrm xbone/apps/prm/webvis
-@dirrm xbone/apps/prm
-@dirrm xbone/apps/test-script
-@dirrm xbone/apps
-@dirrm xbone/conf/named/xbone
-@dirrm xbone/conf/named
-@dirrm xbone/conf/routing
-@dirrm xbone/conf/apache
-@dirrm xbone/conf/openldap
-@dirrm xbone/conf/cert
-@dirrm xbone/conf
-@dirrm xbone/man/man5
-@dirrm xbone/man/man8
-@dirrm xbone/man
-@dirrm xbone/programs/modules/cpan/IO/Socket
-@dirrm xbone/programs/modules/cpan/IO
-@dirrm xbone/programs/modules/cpan/Net/IP
-@dirrm xbone/programs/modules/cpan/Net
-@dirrm xbone/programs/modules/cpan
-@dirrm xbone/programs/modules
-@dirrm xbone/programs
-@dirrm xbone/www/htdocs/images
-@dirrm xbone/www/htdocs
-@dirrm xbone/www/lib
-@dirrm xbone/www/s-cgi-bin
-@dirrm xbone/www/s-htdocs/xml/images
-@dirrm xbone/www/s-htdocs/xml
-@dirrm xbone/www/s-htdocs
-@dirrm xbone/www/xb-cgi-bin
-@dirrm xbone/www
-@dirrm xbone/install/ports
-@dirrm xbone/install/patches/linux
-@dirrm xbone/install/patches/openldap
-@dirrm xbone/install/patches
-@dirrm xbone/install
-@dirrm xbone
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
deleted file mode 100644
index 4266af043de7..000000000000
--- a/net/xipdump/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by: UMENO Takashi <umeno@rr.iij4u.or.jp>
-# $FreeBSD$
-
-PORTNAME=	xipdump
-PORTVERSION=	1.5.4
-PORTREVISION=	5
-CATEGORIES=	net
-MASTER_SITES=	http://www.lse.epita.fr/twiki/pub/Projects/XipDump/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Displays IP packets using X window
-
-BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
-
-USE_XORG=	xt x11 ice xaw xmu
-GNU_CONFIGURE=	yes
-LDFLAGS+=	`${LIBNET_CONFIG} --libs`
-CFLAGS+=	`${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines` \
-		-I/usr/include
-
-PLIST=	${WRKDIR}/PLIST
-
-MAN8=	xipdump.8
-
-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet10-config
-
-NO_STAGE=	yes
-post-build:
-	@${CP} ${PKGDIR}/pkg-plist ${PLIST}
-	@(cd ${WRKSRC}/data; ${FIND} pkc pkt ! -type d | \
-		${SED} -e 's|^|share/xipdump/|' >> ${PLIST})
-	@${ECHO_CMD} "@dirrm share/xipdump/pkt" >> ${PLIST}
-	@${ECHO_CMD} "@dirrm share/xipdump/pkc" >> ${PLIST}
-	@${ECHO_CMD} "@dirrm share/xipdump" >> ${PLIST}
-
-.include <bsd.port.mk>
diff --git a/net/xipdump/distinfo b/net/xipdump/distinfo
deleted file mode 100644
index ffc8d2dd53de..000000000000
--- a/net/xipdump/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xipdump-1.5.4.tgz) = 9be9179ad431d31b84ca9186210b81e82b20a477cd9623877d40d420eb41eb15
-SIZE (xipdump-1.5.4.tgz) = 311526
diff --git a/net/xipdump/files/patch-XmgMacro.c b/net/xipdump/files/patch-XmgMacro.c
deleted file mode 100644
index 1e045a057587..000000000000
--- a/net/xipdump/files/patch-XmgMacro.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- XmgMacro.c.orig	Mon Nov 15 10:47:25 1999
-+++ XmgMacro.c	Tue Oct 10 16:10:50 2000
-@@ -274,7 +274,7 @@
- #if defined(__osf__) && defined(__alpha)
- 			   (ArgList)(var._a0),
- #else
--			   (ArgList)var,
-+			   va_arg(var, ArgList),
- #endif
- 			   total_count);
- #if XtSpecificationRelease>4  
diff --git a/net/xipdump/files/patch-configure b/net/xipdump/files/patch-configure
deleted file mode 100644
index 735ad1231d2b..000000000000
--- a/net/xipdump/files/patch-configure
+++ /dev/null
@@ -1,52 +0,0 @@
---- configure.orig	Wed Dec 22 09:51:48 1999
-+++ configure
-@@ -1360,8 +1360,10 @@
- 	LDFLAGS="$LDFLAGS -L$PCAP_LIBPATH"
- fi
- 
-+if false
-+then
- echo $ac_n "checking for local libnet library""... $ac_c" 1>&6
- echo "configure:1365: checking for local libnet library" >&5
-     libnet=FAIL
-     lastdir=FAIL
-     places=`ls .. | sed -e 's,/$,,' -e 's,^,../,' | \
-@@ -1389,18 +1391,7 @@
- then
- 	LDFLAGS="$LDFLAGS -L$LIBNET_LIBPATH"
- fi
--
--if test "x$ac_cv_c_bigendian" = "xyes"; then
--       cat >> confdefs.h <<\EOF
--#define LIBNET_BIG_ENDIAN 1
--EOF
--
--else
--       cat >> confdefs.h <<\EOF
--#define LIBNET_LIL_ENDIAN 1
--EOF
--
- fi
--       
-+
- for ac_func in gethostbyname getservbyname
- do
-@@ -1877,6 +1868,18 @@
- fi
- 
- 
-+if test "x$ac_cv_c_bigendian" = "xyes"; then
-+       cat >> confdefs.h <<\EOF
-+#define LIBNET_BIG_ENDIAN 1
-+EOF
-+
-+else
-+       cat >> confdefs.h <<\EOF
-+#define LIBNET_LIL_ENDIAN 1
-+EOF
-+
-+fi
-+       
- 
- for ac_func in bzero bcopy bcmp strdup qsort snprintf usleep strerror strtol strtoul dlopen scandir
- do
diff --git a/net/xipdump/files/patch-xipshcut.c b/net/xipdump/files/patch-xipshcut.c
deleted file mode 100644
index 205ae5753823..000000000000
--- a/net/xipdump/files/patch-xipshcut.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- xipshcut.c.orig	Fri Oct 29 05:23:57 1999
-+++ xipshcut.c	Mon Nov 15 10:41:54 1999
-@@ -27,7 +27,7 @@
-   {"",
-    "<b>%Timestamp%</b>: %Pat% %ether.shost% %ether.dhost% %ether.Type% %Len%"},
--  {"arp[6:2] = 1",
-+  {"arp[7] = 1 && arp[6] = 0",
-    "<b>%Timestamp%</b>: arp who-has %arpethip.Tpa% tell %arpethip.Spa%"},
--  {"arp[6:2] = 2",
-+  {"arp[7] = 2 && arp[6] = 0",
-    "<b>%Timestamp%</b>: %arpethip.Spa% tells %arpethip.Tpa% he has %arpethip.sha%"},
-   {"ip",
diff --git a/net/xipdump/pkg-descr b/net/xipdump/pkg-descr
deleted file mode 100644
index 8e5eda7e9127..000000000000
--- a/net/xipdump/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-xipdump - displays ip packets using X window.
-
-xipdump is a protocol analyzer and tester. It's a kind of graphical
-tcpdump(8) with possibility of changing packet values and resending them.
-It could be also designed by term "human ip stack". 
diff --git a/net/xipdump/pkg-plist b/net/xipdump/pkg-plist
deleted file mode 100644
index f39124d239ab..000000000000
--- a/net/xipdump/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/xipdump
-lib/X11/app-defaults/Xipdump
diff --git a/net/xorp-devel/Makefile b/net/xorp-devel/Makefile
deleted file mode 100644
index c4b4856f18b7..000000000000
--- a/net/xorp-devel/Makefile
+++ /dev/null
@@ -1,102 +0,0 @@
-# Created by: Bruce M Simpson <bms@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	xorp-devel
-PORTVERSION=	2009120801
-PORTREVISION=	3
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	bms
-DISTNAME=	xorp-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Open source network routing platform, development branch
-
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-# Uses libcurses, libcrypto, librt from base system.
-LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs \
-		libpcap.so:${PORTSDIR}/net/libpcap
-
-CONFLICTS=	xorp-1*
-
-NOMAN=		defined
-
-USE_GCC=	any
-USE_PYTHON_BUILD=	2
-USES=		scons tar:bzip2
-NO_STAGE=	yes
-#USE_OPENSSL=	yes
-
-OPTIONS_DEFINE=	OPTIMIZE ORIGIN SHARED STRIP TCP_RPC
-OPTIONS_DEFAULT=	OPTIMIZE ORIGIN SHARED STRIP
-OPTIMIZE_DESC=	Build with optimization
-ORIGIN_DESC=	Use ORIGIN with shared libraries
-SHARED_DESC=	Build with shared libraries
-TCP_RPC_DESC=	Use TCP as RPC transport (defaults to AF_LOCAL)
-
-#
-# To roll snapshot: as bms: make BOOTSTRAP=defined fetch
-#
-.if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
-SVN_REV=	11685		# svn tip at epoch 2009120801
-SVNROOT_URI=	http://xorp.svn.sourceforge.net/svnroot/xorp
-
-do-fetch:
-	${MKDIR} ${WRKDIR}
-	svn export -r ${SVN_REV} ${SVNROOT_URI}/trunk/xorp ${WRKSRC}
-	cd ${WRKDIR}; tar cvfy ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME}
-.if ${USER} == bms
-	${CHMOD} ugo+r ${DISTDIR}/${DISTNAME}.tar.bz2
-	scp -p ${DISTDIR}/${DISTNAME}.tar.bz2 \
-	    freefall.freebsd.org:public_distfiles/
-.endif
-.endif # defined(BOOTSTRAP)
-
-.include <bsd.port.options.mk>
-
-XORP_GROUP=	xorp
-USE_RC_SUBR=	xorp
-
-MAKE_ARGS+=	prefix=${PREFIX}
-
-.if ${PORT_OPTIONS:MOPTIMIZE}
-MAKE_ARGS+=	optimize=yes
-.else
-MAKE_ARGS+=	optimize=no
-.endif
-
-.if ${PORT_OPTIONS:MSHARED}
-MAKE_ARGS+=	shared=true
-PLIST_SUB+=	XORP_SHLIB=""
-USE_LDCONFIG=	${PREFIX}/lib/xorp/lib
-. if ${PORT_OPTIONS:MORIGIN}
-MAKE_ARGS+=	origin=true
-. else
-MAKE_ARGS+=	origin=false
-. endif
-.else
-MAKE_ARGS+=	shared=false
-PLIST_SUB+=	XORP_SHLIB="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSTRIP}
-MAKE_ARGS+=	strip=true
-.else
-MAKE_ARGS+=	strip=false
-.endif
-
-.if ${PORT_OPTIONS:MTCP_RPC}
-MAKE_ARGS+=	transport=tcp
-.else
-MAKE_ARGS+=	transport=local
-.endif
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
-
-post-install:
-	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.mk>
diff --git a/net/xorp-devel/distinfo b/net/xorp-devel/distinfo
deleted file mode 100644
index ca2b6ceb5659..000000000000
--- a/net/xorp-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorp-2009120801.tar.bz2) = 057a3c12c9b0323b0bc0a6f9d8635d74f096d91e5be7e3dd2f2ab2c836205c20
-SIZE (xorp-2009120801.tar.bz2) = 2917658
diff --git a/net/xorp-devel/files/xorp.in b/net/xorp-devel/files/xorp.in
deleted file mode 100644
index 415885618540..000000000000
--- a/net/xorp-devel/files/xorp.in
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# A sample XORP startup script.
-#
-
-# PROVIDE: xorp
-# REQUIRE: netif routing mountcritlocal
-# BEFORE:  NETWORKING
-
-# Add the following lines to /etc/rc.conf to enable xorp:
-#
-# xorp_enable="YES"
-# xorp_conf="%%PREFIX%%/etc/xorp.conf.sample"
-#
-# xorp_flags	(Set as needed)
-
-. /etc/rc.subr
-
-name="xorp"
-rcvar=xorp_enable
-
-load_rc_config $name
-
-: ${xorp_enable="NO"}
-: ${xorp_conf="%%PREFIX%%/etc/xorp.conf"}
-: ${xorp_rtrmgr_pidfile="/var/run/xorp_rtrmgr.pid"}
-: ${xorp_rtrmgr_logfile="/var/log/xorp_rtrmgr.log"}
-: ${xorp_rtrmgr_poll_enable=true}
-: ${xorp_rtrmgr_poll_timeout=90}
-: ${xorp_hardkill_enable=false}
-
-required_files=${xorp_conf}
-command=%%PREFIX%%/sbin/xorp_rtrmgr
-command_args="-c ${xorp_conf}"
-pidfile=${xorp_rtrmgr_pidfile}
-sig_stop=INT
-
-start_precmd="xorp_prestart"
-start_cmd="xorp_start"
-stop_postcmd="xorp_poststop"
-
-xorp_prestart()
-{
-	touch ${xorp_rtrmgr_logfile}
-	return 0
-}
-
-# FIXME use XORP's built-in syslog capability
-
-xorp_start() 
-{
-	pidfile=${xorp_rtrmgr_pidfile}
-
-	echo -n 'Starting XORP router processes:'
-
-	# FIXME use XORP's built-in daemonization
-	echo -n ' xorp_rtrmgr'
-	if ! daemon </dev/null >>${xorp_rtrmgr_logfile} 2>&1 -c -p ${pidfile} \
-	     ${command} ${command_args} ; then
-		warn 'could not bring up xorp_rtrmgr.'
-		return 1
-	fi
-
-	${xorp_rtrmgr_poll_enable} || return 0
-
-	# If startup polling is enabled, then poll xorp_rtrmgr every
-	# second to see if it died, or if it logged successful bringup.
-	# XXX This may be racy on very fast machines, but without
-	# daemonizing support from xorp_rtrmgr it's difficult not to race.
-
-	pid=$(cat ${xorp_rtrmgr_pidfile})
-	timeout=${xorp_rtrmgr_poll_timeout}
-	tick=0
-	fail=true
-
-	until [ $tick = $timeout ];
-	do
-		sleep 1 ; kill -0 ${pid} || break
-		if ( tail -5 ${xorp_rtrmgr_logfile} | \
-		    grep 'No more tasks to run' > /dev/null 2>&1 ) ; then
-			fail=false
-			break
-		fi
-		tick=$((tick + 1))
-	done
-
-	if $fail ; then
-		warn 'xorp_rtrmgr failed to start'
-		return 1
-	fi
-
-	echo '.'
-	return 0
-}
-
-xorp_poststop()
-{
-	rm -f ${xorp_rtrmgr_pidfile} >/dev/null 2>&1 || true
-
-	${xorp_hardkill_enable} || return 0
-	killall -9 -m xorp_\* || true
-
-	return 0
-}
-
-run_rc_command "$1"
diff --git a/net/xorp-devel/pkg-deinstall b/net/xorp-devel/pkg-deinstall
deleted file mode 100644
index d242a426bda8..000000000000
--- a/net/xorp-devel/pkg-deinstall
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/net/xorp-devel/pkg-deinstall,v 1.1 2009-12-08 10:53:09 bms Exp $
-#
-
-PATH=/bin:/usr/sbin
-
-if [ -z "${XORP_GROUP}" ]; then
-	XORP_GROUP=xorp
-fi
-
-case $2 in
-	POST-DEINSTALL)
-		if pw group show ${XORP_GROUP} 2>/dev/null 
-		then
-			echo "Deleting group ${XORP_GROUP}..."
-			pw groupdel -n ${XORP_GROUP} 2>/dev/null
-		else
-			echo "Group ${XORP_GROUP} not found!"
-		fi
-	;;
-esac
diff --git a/net/xorp-devel/pkg-descr b/net/xorp-devel/pkg-descr
deleted file mode 100644
index edfb52b83e6f..000000000000
--- a/net/xorp-devel/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-XORP is the eXtensible Open Router Platform.
-
-The XORP project is developing an open source software router. The software
-is intended to be stable and fully featured enough for production use, and
-flexible and extensible enough for research use.  The software is covered by
-a mixture of LGPLv2 / GPLv2 licenses, and the code is publicly available,
-allowing for production deployment and commercial development.
-
-This port is for the latest SVN version of XORP.
-
-WWW: http://www.xorp.org/
diff --git a/net/xorp-devel/pkg-install b/net/xorp-devel/pkg-install
deleted file mode 100644
index fb1e91cee0cf..000000000000
--- a/net/xorp-devel/pkg-install
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/net/xorp-devel/pkg-install,v 1.1 2009-12-08 10:53:10 bms Exp $
-#
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-if [ -z "${XORP_GROUP}" ]; then
-	XORP_GROUP=xorp
-fi
-
-case $2 in
-        POST-INSTALL)
-		if [ ! -f ${PREFIX}/etc/xorp.conf.sample ]; then \
-			cp ${WRKSRC}/rtrmgr/config/multicast4.boot \
-			   ${PREFIX}/etc/xorp.conf.sample; \
-		fi
-		if pw group show "${XORP_GROUP}" 2>/dev/null; then \
-			echo "You already have a group \"${XORP_GROUP}\", so I will use it."; \
-		else \
-			echo "Adding group \"${XORP_GROUP}\"."; \
-			pw groupadd -n ${XORP_GROUP} 2>/dev/null; \
-		fi
-		echo ""
-		echo "Add the following lines to /etc/rc.conf to enable xorp:"
-		echo ""
-		echo "defaultrouter=\"NO\""
-		echo "xorp_enable=\"YES\""
-		echo ""
-		echo "A configuration file must be created at ${PREFIX}/etc/xorp.conf before use."
-		echo ""
-		echo "Users who will be changing the xorp configuration via xorpsh"
-		echo "must be members of the group xorp."
-		echo ""
-	;;
-esac
diff --git a/net/xorp-devel/pkg-plist b/net/xorp-devel/pkg-plist
deleted file mode 100644
index 3496b4be2026..000000000000
--- a/net/xorp-devel/pkg-plist
+++ /dev/null
@@ -1,188 +0,0 @@
-etc/xorp.conf.sample
-lib/xorp/bin/bgp_print_peers
-lib/xorp/bin/bgp_print_routes
-lib/xorp/bin/cli_generic
-lib/xorp/bin/cli_send_processor_xrl
-lib/xorp/bin/fea_click_config_generator
-lib/xorp/bin/fea_show_interfaces
-lib/xorp/bin/ospf_clear_database
-lib/xorp/bin/ospf_print_lsas
-lib/xorp/bin/ospf_print_neighbours
-lib/xorp/bin/rib_show_distances
-lib/xorp/bin/rib_show_routes
-lib/xorp/bin/rip_show_peer_stats
-lib/xorp/bin/rip_show_stats
-%%XORP_SHLIB%%lib/xorp/lib/libxif_bgp.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_cli_manager.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_cli_processor.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_common.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_coord.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_datain.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_click.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_fib.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_fib_client.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_firewall.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_ifmgr.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_ifmgr_mirror.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_ifmgr_replicator.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_rawlink.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_rawlink_client.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_rawpkt4.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_rawpkt4_client.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_rawpkt6.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_rawpkt6_client.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_fib2mrib.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_finder.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_finder_client.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_finder_event_notifier.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_finder_event_observer.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_fti.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_mfea.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_mfea_client.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_mld6igmp.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_mld6igmp_client.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_ospfv2.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_ospfv3.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_pim.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_policy.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_policy_backend.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_policy_redist4.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_policy_redist6.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_profile.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_profile_client.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_redist4.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_redist6.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_redist_transaction4.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_redist_transaction6.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_rib.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_rib_client.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_rip.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_ripng.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_rtrmgr.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_rtrmgr_client.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_socket4.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_socket4_user.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_socket6.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_socket6_user.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_static_routes.so
-%%XORP_SHLIB%%lib/xorp/lib/libxif_vrrp.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_cli.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_comm.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_core.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_fea.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_fea_client.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_fea_control_socket.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_fea_data_plane_managers.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_fea_fibconfig.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_fea_firewall.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_fea_ifconfig.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_fea_io.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_fib2mrib.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_finder.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_ipc.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_mld6igmp.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_mrt.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_ospf.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_pim.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_policy.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_policy_backend.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_policy_common.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_proto.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_rib.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_rip.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_rip_xrl.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_ripng.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_ripng_xrl.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_static_routes.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_tecla.so
-%%XORP_SHLIB%%lib/xorp/lib/libxorp_vrrp.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_bgp.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_cli.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_coord.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_fea.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_fea_ifmgr_mirror.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_fib2mrib.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_finder.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_finder_client.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_mfea.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_mld6igmp.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_ospfv2.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_ospfv3.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_pim.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_policy.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_profiler.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_rib.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_ribclient.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_rip.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_ripng.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_rtrmgr.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_show_distances.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_show_routes.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_static_routes.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_vrrp.so
-%%XORP_SHLIB%%lib/xorp/lib/libxst_xorpsh.so
-lib/xorp/sbin/xorp_bgp
-lib/xorp/sbin/xorp_fea
-lib/xorp/sbin/xorp_fea_dummy
-lib/xorp/sbin/xorp_fib2mrib
-lib/xorp/sbin/xorp_igmp
-lib/xorp/sbin/xorp_mld
-lib/xorp/sbin/xorp_ospfv2
-lib/xorp/sbin/xorp_ospfv3
-lib/xorp/sbin/xorp_pimsm4
-lib/xorp/sbin/xorp_pimsm6
-lib/xorp/sbin/xorp_policy
-lib/xorp/sbin/xorp_rib
-lib/xorp/sbin/xorp_rip
-lib/xorp/sbin/xorp_ripng
-lib/xorp/sbin/xorp_static_routes
-lib/xorp/sbin/xorp_vrrp
-sbin/xorp_profiler
-sbin/xorp_rtrmgr
-sbin/xorpsh
-share/xorp/templates/bgp.cmds
-share/xorp/templates/bgp.tp
-share/xorp/templates/fea.cmds
-share/xorp/templates/fea.tp
-share/xorp/templates/fib2mrib.tp
-share/xorp/templates/firewall.tp
-share/xorp/templates/host.cmds
-share/xorp/templates/igmp.cmds
-share/xorp/templates/igmp.tp
-share/xorp/templates/interfaces.tp
-share/xorp/templates/mfea.cmds
-share/xorp/templates/mfea4.tp
-share/xorp/templates/mfea6.cmds
-share/xorp/templates/mfea6.tp
-share/xorp/templates/misc.cmds
-share/xorp/templates/mld.cmds
-share/xorp/templates/mld.tp
-share/xorp/templates/ospfv2.cmds
-share/xorp/templates/ospfv2.tp
-share/xorp/templates/ospfv3.cmds
-share/xorp/templates/ospfv3.tp
-share/xorp/templates/pim.cmds
-share/xorp/templates/pim6.cmds
-share/xorp/templates/pimsm4.tp
-share/xorp/templates/pimsm6.tp
-share/xorp/templates/plumbing.tp
-share/xorp/templates/policy.cmds
-share/xorp/templates/policy.tp
-share/xorp/templates/protocols.tp
-share/xorp/templates/rib.cmds
-share/xorp/templates/rib.tp
-share/xorp/templates/rip.cmds
-share/xorp/templates/rip.tp
-share/xorp/templates/ripng.cmds
-share/xorp/templates/ripng.tp
-share/xorp/templates/rtrmgr.tp
-share/xorp/templates/static_routes.tp
-share/xorp/templates/vrrp.cmds
-share/xorp/templates/vrrp.tp
-share/xorp/templates/xorpsh.cmds
-@dirrm share/xorp/templates
-@dirrm share/xorp
-%%XORP_SHLIB%%@dirrm lib/xorp/lib
-@dirrm lib/xorp/bin
-@dirrm lib/xorp/sbin
-@dirrm lib/xorp
diff --git a/news/Makefile b/news/Makefile
index 101725f47263..c42589374ca1 100644
--- a/news/Makefile
+++ b/news/Makefile
@@ -11,7 +11,6 @@
     SUBDIR += cleanfeed
     SUBDIR += cnews
     SUBDIR += crashmail
-    SUBDIR += diablo
     SUBDIR += fidogate
     SUBDIR += fidogate-ds
     SUBDIR += golded+
diff --git a/news/diablo/Makefile b/news/diablo/Makefile
deleted file mode 100644
index 7362800ecce4..000000000000
--- a/news/diablo/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# Created by: James FitzGibbon <jfitz@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	diablo
-PORTVERSION=	5.1
-CATEGORIES=	news
-MASTER_SITES=	http://www.openusenet.org/diablo/download/
-DISTNAME=	${PKGNAME}-REL
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Comprehensive newsfeeding and newsreading software package
-
-BUILD_DEPENDS=	xmake:${PORTSDIR}/devel/xmake
-
-MAN5=		diablo-kp.5 diablo-files.5
-MAN8=		dicmd.8 didump.8 dexpireover.8 dfeedinfo.8 dgrpctl.8 \
-		dilookup.8 diloadfromspool.8 doutq.8 dreadart.8 \
-		dreaderd.8 dpath.8 drcmd.8 dsyncgroups.8 dreadover.8 \
-		dkp.8 diablo.8 dexpire.8 dspoolout.8 dnewslink.8 \
-		doverctl.8 drequeue.8 dhisexpire.8
-PORTDOCS=	COPYRIGHT INSTALL README.READER README.SERVER RELEASE_NOTES
-
-NO_STAGE=	yes
-
-OPTIONS_DEFINE=	DES DOCS
-DES_DESC=	DES encryption support
-
-.include <bsd.port.options.mk>
-
-post-patch:
-	${CP} ${SCRIPTDIR}/diablo.sh-sample ${WRKDIR}
-	${REINPLACE_CMD} -E 's|%%PREFIX%%|${PREFIX}|g ;\
-		s|-g -O.?|${CFLAGS}| ; s|g?cc|${CC}|' \
-		${WRKDIR}/diablo.sh-sample ${WRKSRC}/XMakefile.inc
-# Fix for GCC 4.2
-	${REINPLACE_CMD} -e 's|VServerConfig\[\]|*VServerConfig|' \
-		${WRKSRC}/dreaderd/main.c
-
-.if empty(PORT_OPTIONS:MDES)
-	${REINPLACE_CMD} -e 's| -ldes||g' ${WRKSRC}/XMakefile.inc
-.endif
-
-do-build:
-	(cd ${WRKSRC} && xmake all)
-
-do-install:
-	${MKDIR} ${PREFIX}/news/dbin
-	(cd ${WRKSRC} && xmake install)
-	${INSTALL_SCRIPT} ${WRKDIR}/diablo.sh-sample ${PREFIX}/etc/rc.d
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${RM} -rf ${PREFIX}/news/man
-
-.include <bsd.port.mk>
diff --git a/news/diablo/distinfo b/news/diablo/distinfo
deleted file mode 100644
index d22582a57b65..000000000000
--- a/news/diablo/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (diablo-5.1-REL.tgz) = db8155fcb306cc3f606809c420baa094742d415b9f52cb878022aecc4ee8b482
-SIZE (diablo-5.1-REL.tgz) = 694765
diff --git a/news/diablo/files/patch-aa b/news/diablo/files/patch-aa
deleted file mode 100644
index 4ac2344dc701..000000000000
--- a/news/diablo/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- XMakefile.inc.orig	Tue Jun 20 10:31:09 2000
-+++ XMakefile.inc	Tue Jun 20 10:43:22 2000
-@@ -20,8 +20,8 @@
- #endif
- 
- .set LFLAGS	-L$(BD)obj -lfilter -ldiablo -lutil -lm
--.set IDIR	/news
--.set MDIR	/news/man
-+.set IDIR	%%PREFIX%%/news
-+.set MDIR	%%PREFIX%%/man
- .set INSTALL	install
- 
- #ifdef __FreeBSD__
-@@ -41,5 +41,5 @@
- .set INSTALL	/usr/ucb/install
- #endif
- 
--.set DIST /news
-+.set DIST %%PREFIX%%/news
- 
diff --git a/news/diablo/pkg-descr b/news/diablo/pkg-descr
deleted file mode 100644
index 867d6fc08ed1..000000000000
--- a/news/diablo/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Diablo is a comprehensive newsfeeding and newsreading software package
-that was originally developed by Matthew Dillon and is now run as an open
-source project.  Diablo is significantly faster and more robust than INN,
-and scales well to multi-server installations.
-
-WWW: http://www.openusenet.org/diablo/
diff --git a/news/diablo/pkg-install b/news/diablo/pkg-install
deleted file mode 100644
index eb06b347b27e..000000000000
--- a/news/diablo/pkg-install
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-PKGNAME=$1
-
-case $2 in
-    PRE-INSTALL)
-	;;
-    POST-INSTALL)
-	NEWSBASE=${PREFIX:-/usr/local}/news
-        install -d \
-	    ${NEWSBASE}/dqueue \
-	    ${NEWSBASE}/spool \
-	    ${NEWSBASE}/spool/news \
-	    ${NEWSBASE}/spool/cache \
-	    ${NEWSBASE}/spool/group \
-	    ${NEWSBASE}/spool/postq
-	chown -R news:news ${NEWSBASE}
-	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/news/diablo/pkg-message b/news/diablo/pkg-message
deleted file mode 100644
index fcc40a2a6574..000000000000
--- a/news/diablo/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-
-Post-install notes for Diablo
------------------------------
-
-This port installs a very basic Diablo system.  You will certainly
-want to change paths and partitions before you start using diablo in a
-production environment.  Please refer to the documentation located at
-http://www.openusenet.org/diablo/ for further information.
-
diff --git a/news/diablo/pkg-plist b/news/diablo/pkg-plist
deleted file mode 100644
index 5259e5b68d7a..000000000000
--- a/news/diablo/pkg-plist
+++ /dev/null
@@ -1,111 +0,0 @@
-etc/rc.d/diablo.sh-sample
-news/dactive.kp
-news/dbin/.cvsignore
-news/dbin/.empty
-news/dbin/dcancel
-news/dbin/dclient
-news/dbin/dexpire
-news/dbin/dexpirecache
-news/dbin/dexpireover
-news/dbin/dexpirescoring
-news/dbin/dfeedinfo
-news/dbin/dgrpctl
-news/dbin/diablo
-news/dbin/dicmd
-news/dbin/diconvhist
-news/dbin/didate
-news/dbin/didump
-news/dbin/diload
-news/dbin/diloadfromspool
-news/dbin/dilookup
-news/dbin/dhisctl
-news/dbin/dhisexpire
-news/dbin/dkp
-news/dbin/dlockhistory
-news/dbin/dnewslink
-news/dbin/doutq
-news/dbin/dpath
-news/dbin/dprimehostcache
-news/dbin/drcmd
-news/dbin/dreadart
-news/dbin/dreaderd
-news/dbin/dreadover
-news/dbin/drequeue
-news/dbin/dspaminfo
-news/dbin/dspoolout
-news/dbin/dstart
-news/dbin/dsyncgroups
-news/dbin/pgpverify
-news/dbin/plock
-news/dbin/showlocks
-news/dbin/dfeedtest
-news/dbin/dhisbench
-news/dbin/doverctl
-news/dcontrol.ctl
-news/dexpire.ctl
-news/diablo.config
-news/distrib.pats
-news/dnewsfeeds
-news/dreader.access
-news/dserver.hosts
-news/dspool.ctl
-news/moderators
-news/samples/adm/biweekly.atrim
-news/samples/adm/crontab.sample
-news/samples/adm/daily.atrim
-news/samples/adm/daily.reader
-news/samples/adm/hourly.expire
-news/samples/adm/old.biweekly.atrim.dexpire
-news/samples/adm/rc.news
-news/samples/adm/rot
-news/samples/adm/weekly.reader
-news/samples/dactive.kp
-news/samples/dcontrol.ctl
-news/samples/dexpire.ctl
-news/samples/diablo.config
-news/samples/diablo.hosts
-news/samples/distrib.pats
-news/samples/dnewsfeeds
-news/samples/dnntpspool.ctl
-news/samples/dreader.access
-news/samples/dserver.hosts
-news/samples/dspool.ctl
-news/samples/feeder+reader/dactive.kp
-news/samples/feeder+reader/dcontrol.ctl
-news/samples/feeder+reader/dexpire.ctl
-news/samples/feeder+reader/diablo.config
-news/samples/feeder+reader/distrib.pats
-news/samples/feeder+reader/dnewsfeeds
-news/samples/feeder+reader/dreader.access
-news/samples/feeder+reader/dserver.hosts
-news/samples/feeder+reader/dspool.ctl
-news/samples/feeder+reader/moderators
-news/samples/feeder+reader/README
-news/samples/feeder/diablo.config
-news/samples/feeder/dnewsfeeds
-news/samples/feeder/dspool.ctl
-news/samples/moderators
-news/samples/pgp-sample
-news/samples/reader/dactive.kp
-news/samples/reader/dcontrol.ctl
-news/samples/reader/dexpire.ctl
-news/samples/reader/diablo.config
-news/samples/reader/distrib.pats
-news/samples/reader/dreader.access
-news/samples/reader/dserver.hosts
-news/samples/reader/moderators
-@dirrm news/log
-@dirrm news/spool/postq
-@dirrm news/spool/news
-@dirrm news/spool/group
-@dirrm news/spool/cache
-@dirrm news/spool
-@dirrm news/samples/reader
-@dirrm news/samples/feeder+reader
-@dirrm news/samples/feeder
-@dirrm news/samples/adm
-@dirrm news/samples
-@dirrm news/dqueue
-@dirrm news/dbin
-@dirrm news/run
-@dirrm news
diff --git a/news/diablo/scripts/diablo.sh-sample b/news/diablo/scripts/diablo.sh-sample
deleted file mode 100644
index 4d00b4dd3571..000000000000
--- a/news/diablo/scripts/diablo.sh-sample
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-case $1 in
-start)
-	if [ -x %%PREFIX%%/news/rc.news ] ; then
-	    %%PREFIX%%/news/rc.news && echo -n ' diablo'
-	fi
-	;;
-stop)
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0