diff options
-rw-r--r-- | CVSROOT/modules | 1 | ||||
-rw-r--r-- | MOVED | 1 | ||||
-rw-r--r-- | net/Makefile | 1 | ||||
-rw-r--r-- | net/sixxs-heartbeatd/Makefile | 47 | ||||
-rw-r--r-- | net/sixxs-heartbeatd/distinfo | 3 | ||||
-rw-r--r-- | net/sixxs-heartbeatd/files/Makefile | 13 | ||||
-rw-r--r-- | net/sixxs-heartbeatd/files/patch-client_heartbeat-client.c | 14 | ||||
-rw-r--r-- | net/sixxs-heartbeatd/files/patch-client_heartbeat-hb.c | 23 | ||||
-rw-r--r-- | net/sixxs-heartbeatd/files/patch-client_heartbeat.conf | 29 | ||||
-rw-r--r-- | net/sixxs-heartbeatd/files/sixxs-heartbeatd.sh | 28 | ||||
-rw-r--r-- | net/sixxs-heartbeatd/pkg-descr | 4 | ||||
-rw-r--r-- | net/sixxs-heartbeatd/pkg-plist | 8 |
12 files changed, 1 insertions, 171 deletions
diff --git a/CVSROOT/modules b/CVSROOT/modules index 72b6ed0f0548..e3537605a44a 100644 --- a/CVSROOT/modules +++ b/CVSROOT/modules @@ -14414,7 +14414,6 @@ siteframe ports/www/siteframe sitescooper ports/palm/sitescooper six ports/games/six sixxs-aiccu ports/net/sixxs-aiccu -sixxs-heartbeatd ports/net/sixxs-heartbeatd sjeng ports/games/sjeng sjitter ports/net-mgmt/sjitter sjog ports/sysutils/sjog @@ -3063,3 +3063,4 @@ textproc/ruby-libxslt||2007-06-04|Has expired: Broken on all supported versions www/py-htmltestcase||2007-06-04|Has expired: Upstream site disappeared and dependency is set to expire multimedia/snd-music-duplicates||2007-06-05|Has expired: Development has been ceased, successor is shareware. audio/freebirth||2007-06-05|Has expired: Doesn't work on FreeBSD 5.0 and higher +net/sixxs-heartbeatd||2007-06-05|obsolete, use net/sixxs-aiccu instead diff --git a/net/Makefile b/net/Makefile index 42f7c05b27b8..1d65a9fcc10e 100644 --- a/net/Makefile +++ b/net/Makefile @@ -795,7 +795,6 @@ SUBDIR += sipxtacklib SUBDIR += sipxvxml SUBDIR += sixxs-aiccu - SUBDIR += sixxs-heartbeatd SUBDIR += skstream SUBDIR += skype SUBDIR += skype-devel diff --git a/net/sixxs-heartbeatd/Makefile b/net/sixxs-heartbeatd/Makefile deleted file mode 100644 index 0a3c6d0288ec..000000000000 --- a/net/sixxs-heartbeatd/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# New ports collection makefile for: sixxs-heartbeatd -# Date created: 2004-04-23 -# Whom: Christian Weisgerber <naddy@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= sixxs-heartbeatd -PORTVERSION= 20031026 -PORTREVISION= 2 -CATEGORIES= net ipv6 -MASTER_SITES= http://www.sixxs.net/archive/sixxs/heartbeat/unix/ -DISTNAME= heartbeat-unix-2003-10-26 -EXTRACT_SUFX= .tgz - -MAINTAINER= naddy@FreeBSD.org -COMMENT= SixXS IPv6 tunnel broker heartbeat client - -USE_RC_SUBR= yes -WRKSRC= ${WRKDIR}/heartbeat - -pre-build: - @${CP} ${FILESDIR}/Makefile ${WRKSRC} - @${SED} -e 's:%%PREFIX%%:${PREFIX}:g' \ - -e 's:%%RC_SUBR%%:${RC_SUBR}:g' \ - ${FILESDIR}/sixxs-heartbeatd.sh >${WRKDIR}/sixxs-heartbeatd.sh - @${SED} -e 's:%%GIFCONFIG%%:${GIFCONFIG}:' \ - ${WRKSRC}/client/heartbeat.conf >${WRKDIR}/heartbeat.conf - -do-install: - @${MKDIR} ${DOCSDIR} ${EXAMPLESDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/sixxs-heartbeatd ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/doc/draft-massar-v6ops-heartbeat-00.txt \ - ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/heartbeat.conf ${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKDIR}/sixxs-heartbeatd.sh ${PREFIX}/etc/rc.d - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} > 501100 -GIFCONFIG= netbsd -.else -GIFCONFIG= freebsd -.endif - -.include <bsd.port.post.mk> diff --git a/net/sixxs-heartbeatd/distinfo b/net/sixxs-heartbeatd/distinfo deleted file mode 100644 index 298389d9cfc1..000000000000 --- a/net/sixxs-heartbeatd/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (heartbeat-unix-2003-10-26.tgz) = acd8354e0cfdf20a215d86abc44e2fdb -SHA256 (heartbeat-unix-2003-10-26.tgz) = 8c5b8c92da0f2e02f609bced6410c7e16c3b659a21a6b2454aabe3b2d94fb708 -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 1543d6d08524..000000000000 --- a/net/sixxs-heartbeatd/files/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -.PATH: client common - -PROG= sixxs-heartbeatd -SRCS= heartbeat-client.c hb.c common.c - -DPADD= ${LIBMD} -LDADD= -lmd - -NOMAN= yes - -.include <bsd.prog.mk> diff --git a/net/sixxs-heartbeatd/files/patch-client_heartbeat-client.c b/net/sixxs-heartbeatd/files/patch-client_heartbeat-client.c deleted file mode 100644 index c2bb49457685..000000000000 --- a/net/sixxs-heartbeatd/files/patch-client_heartbeat-client.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- client/heartbeat-client.c.orig Fri Apr 23 22:00:57 2004 -+++ client/heartbeat-client.c Fri Apr 23 22:01:14 2004 -@@ -277,7 +277,7 @@ - if (argc != 2) - { - fprintf(stderr, -- "heartbeat-client <configfile>\n"); -+ "sixxs-heartbeatd <configfile>\n"); - return -1; - } - diff --git a/net/sixxs-heartbeatd/files/patch-client_heartbeat-hb.c b/net/sixxs-heartbeatd/files/patch-client_heartbeat-hb.c deleted file mode 100644 index 3dc64906179c..000000000000 --- a/net/sixxs-heartbeatd/files/patch-client_heartbeat-hb.c +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- client/hb.c.orig Tue Aug 10 08:10:03 2004 -+++ client/hb.c Tue Aug 10 08:09:11 2004 -@@ -91,7 +91,7 @@ - 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 @@ - 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/files/patch-client_heartbeat.conf b/net/sixxs-heartbeatd/files/patch-client_heartbeat.conf deleted file mode 100644 index d358efe01a1f..000000000000 --- a/net/sixxs-heartbeatd/files/patch-client_heartbeat.conf +++ /dev/null @@ -1,29 +0,0 @@ - -$FreeBSD$ - ---- client/heartbeat.conf.orig Sun Oct 26 14:43:39 2003 -+++ client/heartbeat.conf Thu May 13 13:19:32 2004 -@@ -12,11 +12,12 @@ - # os 'linux' - - # Operating System (linux/freebsd/openbsd/netbsd/winxp) --os "linux" -+# Use "freebsd" for FreeBSD 4.x, "netbsd" (sic) for FreeBSD 5.x -+os "%%GIFCONFIG%%" - - # 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 +40,7 @@ - - # 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/files/sixxs-heartbeatd.sh b/net/sixxs-heartbeatd/files/sixxs-heartbeatd.sh deleted file mode 100644 index 1aa21d31e645..000000000000 --- a/net/sixxs-heartbeatd/files/sixxs-heartbeatd.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: sixxs-heartbeatd -# REQUIRE: NETWORKING - -# -# Add the following lines to /etc/rc.conf to enable sixxs-heartbeatd: -# -#sixxs_heartbeatd_enable="YES" -# - -. %%RC_SUBR%% - -name=sixxs_heartbeatd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/sixxs-heartbeatd -command_args=%%PREFIX%%/etc/heartbeat.conf -required_files=%%PREFIX%%/etc/heartbeat.conf - -# set default -sixxs_heartbeatd_enable=${sixxs_heartbeatd_enable:-"NO"} - -load_rc_config ${name} -run_rc_command "$1" diff --git a/net/sixxs-heartbeatd/pkg-descr b/net/sixxs-heartbeatd/pkg-descr deleted file mode 100644 index 8c127b7059bc..000000000000 --- a/net/sixxs-heartbeatd/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This is the heartbeart client for the public dynamic-IPv4 -IPv6 tunnel beta test from the SixXS tunnel service provider. - -WWW: http://www.sixxs.net/tools/heartbeat/ diff --git a/net/sixxs-heartbeatd/pkg-plist b/net/sixxs-heartbeatd/pkg-plist deleted file mode 100644 index 70ceb11c1006..000000000000 --- a/net/sixxs-heartbeatd/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -@comment $FreeBSD$ -etc/rc.d/sixxs-heartbeatd.sh -sbin/sixxs-heartbeatd -%%DOCSDIR%%/README -%%DOCSDIR%%/draft-massar-v6ops-heartbeat-00.txt -%%EXAMPLESDIR%%/heartbeat.conf -@dirrm %%EXAMPLESDIR%% -@dirrm %%DOCSDIR%% |