diff --git a/net/sixxs-heartbeatd/Makefile b/net/sixxs-heartbeatd/Makefile
deleted file mode 100644
index 5e5c2d25e6c..00000000000
--- a/net/sixxs-heartbeatd/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $OpenBSD: Makefile,v 1.5 2006/02/15 05:14:30 david Exp $
-
-COMMENT=	"SixXS IPv6 tunnel broker heartbeat client"
-
-PKGNAME=	sixxs-heartbeatd-20031026p0
-DISTNAME=	heartbeat-unix-2003-10-26
-CATEGORIES=	net
-
-HOMEPAGE=	http://www.sixxs.net/tools/heartbeat/
-MASTER_SITES=	http://www.sixxs.net/archive/sixxs/heartbeat/unix/
-
-# GPL
-PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=		c
-
-EXTRACT_SUFX=	.tgz
-WRKDIST=	${WRKDIR}/heartbeat
-SEPARATE_BUILD=	simple
-
-NO_REGRESS=	Yes
-
-pre-build:
-	cp ${FILESDIR}/Makefile ${WRKBUILD}
-
-MAKE_FLAGS=	SRCDIR=${WRKSRC}
-DOCDIR=		${PREFIX}/share/doc/sixxs-heartbeatd
-EXAMPLEDIR=	${PREFIX}/share/examples/sixxs-heartbeatd
-
-do-install:
-	${INSTALL_DATA_DIR} ${DOCDIR} ${EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC}/client/heartbeat.conf ${EXAMPLEDIR}
-	${INSTALL_PROGRAM} ${WRKBUILD}/sixxs-heartbeatd ${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/doc/draft-massar-v6ops-heartbeat-00.txt \
-	    ${DOCDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/README ${DOCDIR}
-
-.include <bsd.port.mk>
diff --git a/net/sixxs-heartbeatd/distinfo b/net/sixxs-heartbeatd/distinfo
deleted file mode 100644
index f79ffaaad39..00000000000
--- a/net/sixxs-heartbeatd/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 (heartbeat-unix-2003-10-26.tgz) = acd8354e0cfdf20a215d86abc44e2fdb
-RMD160 (heartbeat-unix-2003-10-26.tgz) = 8cded0ba4b5d8486ed33c7d5f578e948fa100bfb
-SHA1 (heartbeat-unix-2003-10-26.tgz) = 43e95c2d868c3c5c8e65d0de1fd47f8c797224f0
-SIZE (heartbeat-unix-2003-10-26.tgz) = 23786
diff --git a/net/sixxs-heartbeatd/files/Makefile b/net/sixxs-heartbeatd/files/Makefile
deleted file mode 100644
index aab9240ade1..00000000000
--- a/net/sixxs-heartbeatd/files/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $OpenBSD: Makefile,v 1.2 2004/04/23 20:28:16 naddy Exp $
-
-PROG=	sixxs-heartbeatd
-SRCS=	heartbeat-client.c hb.c common.c
-
-NOMAN=1
-
-.PATH: ${SRCDIR}/client ${SRCDIR}/common
-
-.include <bsd.prog.mk>
diff --git a/net/sixxs-heartbeatd/patches/patch-client_hb_c b/net/sixxs-heartbeatd/patches/patch-client_hb_c
deleted file mode 100644
index 0e7b5221a9e..00000000000
--- a/net/sixxs-heartbeatd/patches/patch-client_hb_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-client_hb_c,v 1.1 2004/08/10 16:11:30 naddy Exp $
---- client/hb.c.orig	Tue Aug 10 18:06:17 2004
-+++ client/hb.c	Tue Aug 10 18:06:50 2004
-@@ -91,7 +91,7 @@ int heartbeat_socket(
- 	hints.ai_socktype = SOCK_DGRAM;
- 
- 	// Get the POP IPv4 into a sockaddr
--	if (getaddrinfo(sIPv4POP, PORT, &hints, &res) < 0)
-+	if (getaddrinfo(sIPv4POP, PORT, &hints, &res) != 0)
- 	{
- 		hblog(LOG_ERR, "Couldn't resolve POP ip %s\n", sIPv4POP);
- 		close(sockfd);
-@@ -147,7 +147,7 @@ int heartbeat_socket(
- 		hints.ai_socktype = SOCK_DGRAM;
- 		
- 		// Get the POP IPv4 into a sockaddr
--		if (getaddrinfo(sIPv4LocalResolve, NULL, &hints, &res) < 0)
-+		if (getaddrinfo(sIPv4LocalResolve, NULL, &hints, &res) != 0)
- 		{
- 			hblog(LOG_ERR, "Couldn't resolve POP ip %s\n", sIPv4POP);
- 			// We return a -1, thus the app will keep beating
diff --git a/net/sixxs-heartbeatd/patches/patch-client_heartbeat-client_c b/net/sixxs-heartbeatd/patches/patch-client_heartbeat-client_c
deleted file mode 100644
index 49aa4f37bde..00000000000
--- a/net/sixxs-heartbeatd/patches/patch-client_heartbeat-client_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-client_heartbeat-client_c,v 1.2 2004/04/23 20:28:16 naddy Exp $
---- client/heartbeat-client.c.orig	2004-04-21 14:07:53.000000000 +0200
-+++ client/heartbeat-client.c	2004-04-21 14:08:08.000000000 +0200
-@@ -277,7 +277,7 @@ int main(int argc, char *argv[])
- 	if (argc != 2)
- 	{
- 		fprintf(stderr,
--			"heartbeat-client <configfile>\n");
-+			"sixxs-heartbeatd <configfile>\n");
- 		return -1;
- 	}
- 
diff --git a/net/sixxs-heartbeatd/patches/patch-client_heartbeat_conf b/net/sixxs-heartbeatd/patches/patch-client_heartbeat_conf
deleted file mode 100644
index 1c6cc9d86e4..00000000000
--- a/net/sixxs-heartbeatd/patches/patch-client_heartbeat_conf
+++ /dev/null
@@ -1,26 +0,0 @@
-$OpenBSD: patch-client_heartbeat_conf,v 1.1.1.1 2004/04/23 19:32:51 naddy Exp $
---- client/heartbeat.conf.orig	2003-10-26 14:43:39.000000000 +0100
-+++ client/heartbeat.conf	2004-04-15 14:41:51.000000000 +0200
-@@ -12,11 +12,11 @@
- # os 'linux'
- 
- # Operating System (linux/freebsd/openbsd/netbsd/winxp)
--os "linux"
-+os "openbsd"
- 
- # Interface the tunnel should go over
- # used for detecting the local IPv4 endpoint
--ipv4_interface "eth0"
-+ipv4_interface "tun0"
- 
- # IPv4 address of the POP (nlams01/nlams02/nlams04/demun01/iedub01/dkcop01)
- # This is also the address to where heartbeats are sent
-@@ -39,7 +39,7 @@ ipv4_pop "[POP].sixxs.net"
- 
- # Interface to be used for the tunnel
- # will be created on the OS's that need that
--ipv6_interface "sixxs"
-+ipv6_interface "gif0"
- 
- # The local and remote sides of the tunnel
- ipv6_pop "2001:db8::1"
diff --git a/net/sixxs-heartbeatd/pkg/DESCR b/net/sixxs-heartbeatd/pkg/DESCR
deleted file mode 100644
index 8895fb80864..00000000000
--- a/net/sixxs-heartbeatd/pkg/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This is the heartbeat client for the public dynamic-IPv4
-IPv6 tunnel beta test from the SixXS tunnel service provider.
diff --git a/net/sixxs-heartbeatd/pkg/MESSAGE b/net/sixxs-heartbeatd/pkg/MESSAGE
deleted file mode 100644
index ae9d9addcc1..00000000000
--- a/net/sixxs-heartbeatd/pkg/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-Go to www.sixxs.net and get a free account.
-Copy ${PREFIX}/share/examples/sixxs-heartbeatd/heartbeat.conf to
-${SYSCONFDIR} and insert your account data.
-
-You can start the daemon:
-${PREFIX}/sbin/sixxs-heartbeatd ${SYSCONFDIR}/heartbeat.conf
-
-Add the following to the /etc/rc.local script to start the daemon on boot:
-
-if [ -x ${PREFIX}/sbin/sixxs-heartbeatd -a -f ${SYSCONFDIR}/heartbeat.conf ]; then
-	echo -n ' sixxs-heartbeatd'
-	${PREFIX}/sbin/sixxs-heartbeatd ${SYSCONFDIR}/heartbeat.conf
-fi
-
diff --git a/net/sixxs-heartbeatd/pkg/PLIST b/net/sixxs-heartbeatd/pkg/PLIST
deleted file mode 100644
index 1d470b42f23..00000000000
--- a/net/sixxs-heartbeatd/pkg/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/08/10 16:11:30 naddy Exp $
-sbin/sixxs-heartbeatd
-share/doc/sixxs-heartbeatd/
-share/doc/sixxs-heartbeatd/README
-share/doc/sixxs-heartbeatd/draft-massar-v6ops-heartbeat-00.txt
-share/examples/sixxs-heartbeatd/
-share/examples/sixxs-heartbeatd/heartbeat.conf