summaryrefslogtreecommitdiff
path: root/net/mcl
diff options
context:
space:
mode:
authorcvs2svn <cvs2svn@FreeBSD.org>2009-04-28 21:27:54 +0000
committercvs2svn <cvs2svn@FreeBSD.org>2009-04-28 21:27:54 +0000
commitb6bb8c3d3a17625aa826094130b3d84530b6dae4 (patch)
treef2de4a4d4b2f5c3fcbd1ee2ea6cce6d571bfb5f7 /net/mcl
parent- Fix PLIST (diff)
This commit was manufactured by cvs2svn to create tag 'RELEASE_7_2_0'.release/7.2.0
Notes
Notes: svn path=/head/; revision=232918 svn path=/tags/RELEASE_7_2_0/; revision=232919; tag=release/7.2.0
Diffstat (limited to 'net/mcl')
-rw-r--r--net/mcl/Makefile83
-rw-r--r--net/mcl/distinfo3
-rw-r--r--net/mcl/files/patch-Makefile13
-rw-r--r--net/mcl/files/patch-Makefile.common33
-rw-r--r--net/mcl/files/patch-alc-Makefile16
-rw-r--r--net/mcl/files/patch-check-alc-Makefile21
-rw-r--r--net/mcl/files/patch-display.c14
-rw-r--r--net/mcl/files/patch-fcast-Makefile28
-rw-r--r--net/mcl/files/patch-fcast.h20
-rw-r--r--net/mcl/files/patch-flute-Makefile52
-rw-r--r--net/mcl/files/patch-flute.h13
-rw-r--r--net/mcl/files/patch-mcl_debug.cpp11
-rw-r--r--net/mcl/files/patch-mcl_includes.h36
-rw-r--r--net/mcl/files/patch-mcl_lib.cpp27
-rw-r--r--net/mcl/files/patch-mcl_network.cpp48
-rw-r--r--net/mcl/files/patch-mcl_osdep.h32
-rw-r--r--net/mcl/files/patch-mcl_profile.h11
-rw-r--r--net/mcl/files/patch-mclftp-Makefile17
-rw-r--r--net/mcl/files/patch-robcast-Makefile19
-rw-r--r--net/mcl/files/patch-rse_fec.cpp20
-rw-r--r--net/mcl/files/patch-test_abort.c13
-rw-r--r--net/mcl/files/patch-test_demux_label1_rx.c13
-rw-r--r--net/mcl/files/patch-test_demux_label1_tx.c13
-rw-r--r--net/mcl/files/patch-test_dyn_tsi.c13
-rw-r--r--net/mcl/files/patch-test_multi_sessions1.c14
-rw-r--r--net/mcl/files/patch-test_multi_sessions2.c14
-rw-r--r--net/mcl/files/patch-test_no_tx.c13
-rw-r--r--net/mcl/files/patch-test_rebootable_client.c13
-rw-r--r--net/mcl/files/patch-test_seq_of_tx_sessions.c14
-rw-r--r--net/mcl/files/patch-test_several_fec_codecs.c13
-rw-r--r--net/mcl/files/patch-test_vtm_rx.c13
-rw-r--r--net/mcl/files/patch-test_vtm_tx.c13
-rw-r--r--net/mcl/files/patch-test_wait_rx_receiver.c12
-rw-r--r--net/mcl/files/patch-test_wait_rx_sender.c12
-rw-r--r--net/mcl/files/patch-test_wait_tx.c13
-rw-r--r--net/mcl/pkg-descr11
-rw-r--r--net/mcl/pkg-plist8
37 files changed, 0 insertions, 732 deletions
diff --git a/net/mcl/Makefile b/net/mcl/Makefile
deleted file mode 100644
index d087695902d6..000000000000
--- a/net/mcl/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-# New ports collection makefile for: mcl
-# Date created: 29 October 2003
-# Whom: past@noc.ntua.gr
-#
-# $FreeBSD$
-#
-
-PORTNAME= mcl
-PORTVERSION= 2.99.1
-PORTREVISION= 1
-CATEGORIES= mbone net
-MASTER_SITES= http://www.inrialpes.fr/planete/people/roca/mcl/bin/
-DISTNAME= mcl_v2.99.1
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Implementation of the ALC and NORM Reliable Multicast Protocols
-
-BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \
- gdome-config:${PORTSDIR}/textproc/gdome2 \
- glib-gettextize:${PORTSDIR}/devel/glib20
-
-USE_LDCONFIG= yes
-USE_GMAKE= yes
-MAN1= fcast.1 fcastn.1 mclrecv2.1 mclsend2.1
-MAN2= mcl_abort.2 mcl_close.2 mcl_ctl.2 mcl_open.2 mcl_recv.2 \
- mcl_send.2 mcl_wait_event.2
-
-pre-patch:
- @cd ${WRKSRC} && \
- ${MKDIR} bin/freebsd
-
-post-patch:
- @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \
- ${WRKSRC}/src/alc/Makefile
- @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \
- ${WRKSRC}/check/alc/Makefile
- @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \
- ${WRKSRC}/fcast/Makefile
- @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \
- ${WRKSRC}/flute/Makefile
- @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \
- ${WRKSRC}/mclftp/Makefile
- @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \
- ${WRKSRC}/robcast/Makefile
-
-pre-install:
- @${REINPLACE_CMD} -Ee 's#../alc/#alc/#g' \
- ${WRKSRC}/src/common/mcl_lib_api.h
- @${REINPLACE_CMD} -Ee 's#../norm/#norm/#g' \
- ${WRKSRC}/src/common/mcl_lib_api.h
-
-do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/fcast ${PREFIX}/bin
- @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/flute ${PREFIX}/bin
- @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/robcast_client ${PREFIX}/bin
- @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/robcast_server ${PREFIX}/bin
- @${INSTALL_DATA} ${WRKSRC}/bin/freebsd/libmclalc.a ${PREFIX}/lib
- @${INSTALL_DATA} ${WRKSRC}/src/common/mcl_lib_api.h ${PREFIX}/include
- @${INSTALL_DATA} -d ${PREFIX}/include/alc
- @${INSTALL_DATA} ${WRKSRC}/src/alc/mcl_lib_api_alc.h \
- ${PREFIX}/include/alc
- @${INSTALL_MAN} ${WRKSRC}/man/fcast.man.1 ${PREFIX}/man/man1/fcast.1
- @${INSTALL_MAN} ${WRKSRC}/man/fcastn.man.1 ${PREFIX}/man/man1/fcastn.1
- @${INSTALL_MAN} ${WRKSRC}/man/mclrecv2.man.1 \
- ${PREFIX}/man/man1/mclrecv2.1
- @${INSTALL_MAN} ${WRKSRC}/man/mclsend2.man.1 \
- ${PREFIX}/man/man1/mclsend2.1
- @${INSTALL_MAN} ${WRKSRC}/man/mcl_abort.man.2 \
- ${PREFIX}/man/man2/mcl_abort.2
- @${INSTALL_MAN} ${WRKSRC}/man/mcl_close.man.2 \
- ${PREFIX}/man/man2/mcl_close.2
- @${INSTALL_MAN} ${WRKSRC}/man/mcl_ctl.man.2 ${PREFIX}/man/man2/mcl_ctl.2
- @${INSTALL_MAN} ${WRKSRC}/man/mcl_open.man.2 \
- ${PREFIX}/man/man2/mcl_open.2
- @${INSTALL_MAN} ${WRKSRC}/man/mcl_recv.man.2 \
- ${PREFIX}/man/man2/mcl_recv.2
- @${INSTALL_MAN} ${WRKSRC}/man/mcl_send.man.2 \
- ${PREFIX}/man/man2/mcl_send.2
- @${INSTALL_MAN} ${WRKSRC}/man/mcl_wait_event.man.2 \
- ${PREFIX}/man/man2/mcl_wait_event.2
-
-.include <bsd.port.mk>
diff --git a/net/mcl/distinfo b/net/mcl/distinfo
deleted file mode 100644
index c2499bb901b5..000000000000
--- a/net/mcl/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (mcl_v2.99.1.tgz) = d4a5c0c384d45dfa6c2a3dcbdcb3a81e
-SHA256 (mcl_v2.99.1.tgz) = 141966bf922c2995a29eeb73a536ee3f83438835b0f29f99afb626048decdc35
-SIZE (mcl_v2.99.1.tgz) = 368784
diff --git a/net/mcl/files/patch-Makefile b/net/mcl/files/patch-Makefile
deleted file mode 100644
index 8c38fb03e633..000000000000
--- a/net/mcl/files/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig Sun Dec 7 18:35:07 2003
-+++ Makefile Sun Dec 7 18:35:20 2003
-@@ -5,8 +5,8 @@
- # We need the GNU make tool, on some systems it is called
- # gmake, on others make is an alias to gmake. Choose one...
- #
--MAKE = make
--#MAKE = gmake
-+#MAKE = make
-+MAKE = gmake
-
-
- # A phony target is one that is not really the name of a file.
diff --git a/net/mcl/files/patch-Makefile.common b/net/mcl/files/patch-Makefile.common
deleted file mode 100644
index 4cb001289885..000000000000
--- a/net/mcl/files/patch-Makefile.common
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.common.orig Sun Dec 7 18:36:25 2003
-+++ Makefile.common Sun Dec 7 18:38:10 2003
-@@ -24,11 +24,15 @@
- ifeq (${SYSTEM},SunOS)
- OS = solaris
- endif
-+ifeq (${SYSTEM},FreeBSD)
-+ OS = freebsd
-+endif
- #
- # and the old way (e.g. if the above lines do not work!)
- #
- #OS = linux
- #OS = solaris
-+#OS = freebsd
-
-
- # Do you want/need extended memory debugging?
-@@ -59,6 +63,14 @@
- #
- CC = /opt/SUNWspro/bin/CC
- LD = /opt/SUNWspro/bin/CC
-+endif
-+ifeq (${OS},freebsd)
-+ OSFLAGS = -DFREEBSD -I${LOCALBASE}/g++ -I${LOCALBASE}/c++/3.3
-+ # Which compiler?
-+ # NB: use -Wall for compilation warnings with gcc
-+ #
-+ CC = g++ -Wall
-+ LD = g++ -Wall
- endif
-
-
diff --git a/net/mcl/files/patch-alc-Makefile b/net/mcl/files/patch-alc-Makefile
deleted file mode 100644
index b38cb525c35f..000000000000
--- a/net/mcl/files/patch-alc-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/alc/Makefile.orig Tue Jul 22 19:42:18 2003
-+++ src/alc/Makefile Wed Oct 15 17:21:25 2003
-@@ -36,6 +36,13 @@
- LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lpthread
- endif
-
-+ifeq (${OS},freebsd)
-+ # FreeBSD version
-+ BINDIR = ../../bin/freebsd
-+ LDPC_BINDIR = ../../../ldpc/bin/freebsd
-+ LIBRARIES = -lm -pthread
-+endif
-+
-
- ###### Other Variables ######
-
diff --git a/net/mcl/files/patch-check-alc-Makefile b/net/mcl/files/patch-check-alc-Makefile
deleted file mode 100644
index 65fa32515984..000000000000
--- a/net/mcl/files/patch-check-alc-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- check/alc/Makefile.orig Wed Oct 15 18:02:27 2003
-+++ check/alc/Makefile Wed Oct 15 17:24:04 2003
-@@ -35,6 +35,18 @@
- LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lposix4 -mt -lpthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
- endif
-
-+ifeq (${OS},freebsd)
-+ # Linux version
-+ #
-+ BINDIR = ../../bin/freebsd
-+ LDPC_BINDIR = ../../../ldpc/bin/freebsd
-+ # Edit the following two lines as appropriate, according to the FEC
-+ # codec in use: if LDPC is used, then add the libbdpc.a library.
-+ #
-+ LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a
-+ #LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
-+endif
-+
-
- ###### Other variables ######
-
diff --git a/net/mcl/files/patch-display.c b/net/mcl/files/patch-display.c
deleted file mode 100644
index 44ff013dd66f..000000000000
--- a/net/mcl/files/patch-display.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- flute/display.c.orig Wed Jan 7 12:08:23 2004
-+++ flute/display.c Wed Jan 7 12:07:24 2004
-@@ -65,7 +65,11 @@
- signal (SIGTERM, sig_catcher);
- sigaction (SIGTERM, (struct sigaction *) 0, &sa);
- sa.sa_flags |= SA_RESTART;
-+#if defined(FREEBSD)
-+ sa.sa_flags &= ~SA_NOCLDSTOP;
-+#else
- sa.sa_flags &= ~SA_INTERRUPT;
-+#endif
- sigaction (SIGTERM, &sa, (struct sigaction *) 0);
- sigaction (SIGINT, &sa, (struct sigaction *) 0);
- tcsetattr(0, TCSANOW, &new_settings);
diff --git a/net/mcl/files/patch-fcast-Makefile b/net/mcl/files/patch-fcast-Makefile
deleted file mode 100644
index dce7b64a9811..000000000000
--- a/net/mcl/files/patch-fcast-Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- fcast/Makefile.orig Tue Jul 22 19:43:25 2003
-+++ fcast/Makefile Wed Oct 15 17:20:46 2003
-@@ -39,6 +39,14 @@
-
- endif
-
-+ifeq (${OS},freebsd)
-+ # FreeBSD version
-+ #
-+ BINDIR = ../bin/freebsd
-+ LDPC_BINDIR = ../../ldpc/bin/freebsd
-+ LIBRARIES = -lm -pthread
-+endif
-+
-
- ###### Other variables ######
-
-@@ -76,8 +84,8 @@
- # codec in use: if LDPC is used, then add the libbdpc.a library.
- # If only RSE is used and if you don't have the LDPC archive, then
- # remove the libbdpc.a library.
--#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a
--alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
-+alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a
-+#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
- alc: TARGET_FCAST = ${BINDIR}/fcast
- #alc: all
-
diff --git a/net/mcl/files/patch-fcast.h b/net/mcl/files/patch-fcast.h
deleted file mode 100644
index bd50c0f41eb7..000000000000
--- a/net/mcl/files/patch-fcast.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- fcast/fcast.h.orig Tue Jul 22 19:37:39 2003
-+++ fcast/fcast.h Wed Oct 15 16:59:13 2003
-@@ -62,12 +62,16 @@
- #include "frecv.h"
-
-
-+
- #if defined(LINUX) /* On Linux systems, signal handlers must be of __sighandler_t type */
- #define sighandler_t __sighandler_t
-
- #elif defined(SOLARIS) || defined(IRIX) || defined(WIN32)
--
- #define sighandler_t void (*)(int)
-+
-+#elif defined(FREEBSD)
-+#define sighandler_t sig_t
-+
- #endif
-
-
diff --git a/net/mcl/files/patch-flute-Makefile b/net/mcl/files/patch-flute-Makefile
deleted file mode 100644
index 159fef2f7960..000000000000
--- a/net/mcl/files/patch-flute-Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
---- flute/Makefile.orig Wed Nov 26 17:18:21 2003
-+++ flute/Makefile Wed Jan 7 12:38:28 2004
-@@ -36,6 +36,18 @@
-
- endif
-
-+ifeq (${OS},freebsd)
-+ # FreeBSD version:
-+ # CC requires: -mt -lpthread for multithreaded applications
-+ # NB: mpatrol not installed !
-+ #
-+ BINDIR = ../bin/freebsd
-+ LDPC_BINDIR = ../../ldpc/bin/freebsd
-+ LIBRARIES = -lm -pthread -lglib-2.0 -lgdome -lxml2 -L${LOCALBASE}/lib
-+ # added -I/usr/local/include for libgdome header files
-+ ADD_INCLUDES = -I${LOCALBASE}/include/ -I${LOCALBASE}/include/glib-2.0/ -I${LOCALBASE}/include/libgdome/
-+endif
-+
-
- ###### Other variables ######
-
-@@ -73,24 +85,24 @@
- # codec in use: if LDPC is used, then add the libbdpc.a library.
- # If only RSE is used and if you don't have the LDPC archive, then
- # remove the libbdpc.a library.
--#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a
--alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
-+alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a
-+#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
- alc: TARGET_FLUTE = ${BINDIR}/flute
- #alc: all
-
- alc_pure: RM_PROTOCOL = ALC
- # Edit the following two lines as appropriate, according to the FEC
- # codec in use: if LDPC is used, then add the libbdpc.a library.
--#alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a
--alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
-+alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a
-+#alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
- alc_pure: TARGET_FLUTE = ${BINDIR}/flute
- alc_pure: pure
-
- alc_quantify: RM_PROTOCOL = ALC
- # Edit the following two lines as appropriate, according to the FEC
- # codec in use: if LDPC is used, then add the libbdpc.a library.
--#alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a
--alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
-+alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a
-+#alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
- alc_quantify: TARGET_FLUTE = ${BINDIR}/flute
- alc_quantify: quantify
-
diff --git a/net/mcl/files/patch-flute.h b/net/mcl/files/patch-flute.h
deleted file mode 100644
index c38ad033f34c..000000000000
--- a/net/mcl/files/patch-flute.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- flute/flute.h.orig Wed Jan 7 11:13:20 2004
-+++ flute/flute.h Wed Jan 7 11:15:28 2004
-@@ -69,6 +69,10 @@
- #elif defined(SOLARIS) || defined(IRIX) || defined(WIN32)
-
- #define sighandler_t void (*)(int)
-+
-+#elif defined(FREEBSD)
-+#define sighandler_t sig_t
-+
- #endif
-
-
diff --git a/net/mcl/files/patch-mcl_debug.cpp b/net/mcl/files/patch-mcl_debug.cpp
deleted file mode 100644
index 982503f326c9..000000000000
--- a/net/mcl/files/patch-mcl_debug.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/mcl_debug.cpp.orig Tue Jul 22 19:37:39 2003
-+++ src/common/mcl_debug.cpp Wed Oct 15 17:55:58 2003
-@@ -73,7 +73,7 @@
- PRINT_OUT((mcl_stdout, "\tDUMP %d first bytes...\n\t", i * sizeof(int)))
- for (ptr = (int*)buf; i > 0; i--, ptr++) {
- /* convert to big endian format to be sure of byte order */
-- PRINT_OUT((mcl_stdout, "%08x ", htonl(*ptr)))
-+ PRINT_OUT((mcl_stdout, "%08lx ", htonl(*ptr)))
- if (++j == 8) {
- j = 0;
- PRINT_OUT((mcl_stdout, "\n\t"))
diff --git a/net/mcl/files/patch-mcl_includes.h b/net/mcl/files/patch-mcl_includes.h
deleted file mode 100644
index d68a50637331..000000000000
--- a/net/mcl/files/patch-mcl_includes.h
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/alc/mcl_includes.h.orig Tue Jul 22 19:37:39 2003
-+++ src/alc/mcl_includes.h Tue Oct 14 15:23:54 2003
-@@ -40,11 +40,13 @@
- #include <sys/types.h>
- #include <math.h>
-
-+#ifndef FREEBSD
- #if defined(DEBUG) && defined(MPATROL) && !defined(WIN32)
- #include <mpatrol.h>
- #else
- #include <malloc.h>
- #endif
-+#endif
- #include <new> // required by _set_new_handler on linux
-
-
-@@ -58,14 +60,18 @@
- #else /* UNIX Systems */
-
- #include <unistd.h>
-+
-+#ifndef FREEBSD
- #include <values.h> /* for MAXINT */
-+#endif
-+
- #include <strings.h>
- #include <sys/time.h>
- #include <sys/wait.h>
- #include <pthread.h>
- #include <sys/uio.h>
-
--#ifdef SOLARIS
-+#if defined(SOLARIS) || defined(FREEBSD)
- #include <netinet/in_systm.h>
- #endif /* SOLARIS */
-
diff --git a/net/mcl/files/patch-mcl_lib.cpp b/net/mcl/files/patch-mcl_lib.cpp
deleted file mode 100644
index d40dbe58584c..000000000000
--- a/net/mcl/files/patch-mcl_lib.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/alc/mcl_lib.cpp.orig Wed Nov 26 15:38:14 2003
-+++ src/alc/mcl_lib.cpp Tue Dec 16 23:58:46 2003
-@@ -1384,8 +1384,10 @@
- if (id >= MCLCB_MAX_ID || (mclcb = mclcbs[id]) == NULL) {
- TRACE((mcl_stdout, " mcl_recvfrom: not an MCL id, switch to standard recvfrom\n"))
- return (recvfrom(id, (char*)buf, len, 0, saddr,
--#ifdef LINUX
-+#if defined(LINUX)
- (size_t*) /* linux => uint, solaris => int */
-+#elif defined(FREEBSD)
-+ (socklen_t*)
- #endif
- saddr_len));
- }
-@@ -1520,8 +1522,11 @@
- if (id >= MCLCB_MAX_ID || (mclcb = mclcbs[id]) == NULL) {
- TRACE((mcl_stdout, " mcl_recvfrom: not an MCL id, switch to standard recvfrom\n"))
- return (recvfrom(id, (char*)buf, len, 0, saddr,
--#ifdef LINUX
-+#if defined(LINUX)
- (size_t*) /* linux => uint, solaris => int */
-+#elif defined(FREEBSD)
-+ (socklen_t*)
-+
- #endif
- saddr_len));
- }
diff --git a/net/mcl/files/patch-mcl_network.cpp b/net/mcl/files/patch-mcl_network.cpp
deleted file mode 100644
index 6e5a8cfaebfe..000000000000
--- a/net/mcl/files/patch-mcl_network.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/alc/mcl_network.cpp.orig Tue Jul 22 19:37:39 2003
-+++ src/alc/mcl_network.cpp Tue Oct 14 15:47:45 2003
-@@ -414,8 +414,10 @@
- pkt->pkt_len = recvfrom(mg->ses_sock,
- pkt->get_buf(), pkt->get_buf_len(),
- 0, &saddr,
--#ifdef LINUX
-+#if defined(LINUX)
- (size_t*)
-+#elif defined(FREEBSD)
-+ (socklen_t*)
- #endif
- &saddr_len);
- #ifdef WIN32
-@@ -483,8 +485,10 @@
- pkt->pkt_len = recvfrom(mg->priv_sock,
- pkt->get_buf(), pkt->get_buf_len(),
- 0, &saddr,
--#ifdef LINUX
-+#if defined(LINUX)
- (size_t*)
-+#elif defined(FREEBSD)
-+ (socklen_t*)
- #endif
- &saddr_len);
- #ifdef WIN32
-@@ -663,8 +667,10 @@
- err = setsockopt(fd, SOL_SOCKET, buf, (char*)&val, sizeof(val));
- else
- err = getsockopt(fd, SOL_SOCKET, buf, (char*)&val,
--#ifdef LINUX
-- (size_t*) /* linux => uint, solaris => int */
-+#if defined(LINUX)
-+ (size_t*)
-+#elif defined(FREEBSD)
-+ (socklen_t*)
- #endif
- &len);
- if (err < 0) {
-@@ -938,7 +944,7 @@
-
- if (mcl_is_valid_sock(mg->priv_sock) &&
- getsockname(mg->priv_sock, (struct sockaddr *)&tmp_addr,
--#ifdef LINUX
-+#if defined(LINUX) || defined(FREEBSD)
- (socklen_t*)
- #endif
- &tmp_len) < 0) {
diff --git a/net/mcl/files/patch-mcl_osdep.h b/net/mcl/files/patch-mcl_osdep.h
deleted file mode 100644
index 1effff377a98..000000000000
--- a/net/mcl/files/patch-mcl_osdep.h
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/common/mcl_osdep.h.orig Sun Dec 7 18:58:22 2003
-+++ src/common/mcl_osdep.h Sun Dec 7 19:00:39 2003
-@@ -44,7 +44,7 @@
- * bit field order is compiler/OS dependant
- * With linux, see the above LINUX_XXX defines...
- */
--#if defined(LINUX_I386) || defined(WIN32)
-+#if defined(LINUX_I386) || defined(WIN32) || defined (FREEBSD)
- #define _BIT_FIELDS_LTOH
- #undef _BIT_FIELDS_HTOL
-
-@@ -58,7 +58,7 @@
- /*
- * sighandler
- */
--#if defined(LINUX)
-+#if defined(LINUX) || defined (FREEBSD)
- /* On Linux systems, signal handlers must be of __sighandler_t type */
- #define sighandler_t __sighandler_t
-
-@@ -77,9 +77,9 @@
- #define u_int16_t ushort_t /* or uint16_t */
- #define u_int32_t uint_t /* or uint32_t */
-
--#elif defined (WIN32)
-+#elif defined (WIN32) || defined (FREEBSD)
-
--/* u_xxx absent from WIN32! */
-+/* u_xxx absent from WIN32 and ulong absent from FreeBSD! */
- #define u_int8_t unsigned char /* or uint8_t */
- #define u_int16_t unsigned short /* or uint16_t */
- #define u_int32_t unsigned int /* or uint32_t */
diff --git a/net/mcl/files/patch-mcl_profile.h b/net/mcl/files/patch-mcl_profile.h
deleted file mode 100644
index 24408a4ddbfe..000000000000
--- a/net/mcl/files/patch-mcl_profile.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/alc/mcl_profile.h.orig Tue Dec 16 23:47:58 2003
-+++ src/alc/mcl_profile.h Tue Dec 16 23:48:09 2003
-@@ -130,7 +130,7 @@
- /*
- * Do you want to use LDPC large block Forward Error Correction (FEC) ?
- */
--#define LDPC_FEC
-+//#define LDPC_FEC
-
- #if defined(RSE_FEC) || defined(LDPC_FEC)
- #define FEC
diff --git a/net/mcl/files/patch-mclftp-Makefile b/net/mcl/files/patch-mclftp-Makefile
deleted file mode 100644
index 0ddac0210fa9..000000000000
--- a/net/mcl/files/patch-mclftp-Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- mclftp/Makefile.orig Wed Dec 17 00:13:34 2003
-+++ mclftp/Makefile Wed Dec 17 00:15:56 2003
-@@ -36,6 +36,14 @@
- LIBRARIES = -lc -lm -lsocket -lnsl /usr/ucblib/libucb.a -lposix4 -lpthread
- endif
-
-+ifeq (${OS},freebsd)
-+ # FreeBSD version
-+ # MCL library requires -pthread
-+ #
-+ BINDIR = ../bin/freebsd
-+ LIBRARIES = -lm -pthread
-+endif
-+
-
-
- ###### Other variables ######
diff --git a/net/mcl/files/patch-robcast-Makefile b/net/mcl/files/patch-robcast-Makefile
deleted file mode 100644
index f6f4a21f0e42..000000000000
--- a/net/mcl/files/patch-robcast-Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- robcast/Makefile.orig Wed Oct 15 18:03:36 2003
-+++ robcast/Makefile Wed Oct 15 17:33:36 2003
-@@ -29,6 +29,16 @@
- LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lposix4 -lpthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
- endif
-
-+ifeq (${OS},freebsd)
-+ # FreeBSD version
-+ # MCL library requires -pthread
-+ #
-+ BINDIR = ../bin/freebsd
-+ LDPC_BINDIR = ../../ldpc/bin/freebsd
-+ LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a
-+ #LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a
-+endif
-+
-
- ###### Other variables ######
-
diff --git a/net/mcl/files/patch-rse_fec.cpp b/net/mcl/files/patch-rse_fec.cpp
deleted file mode 100644
index 70ea7a5e9790..000000000000
--- a/net/mcl/files/patch-rse_fec.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/common/rse_fec.cpp.orig 2007-08-03 13:59:09.000000000 +0200
-+++ src/common/rse_fec.cpp 2007-08-03 14:00:41.000000000 +0200
-@@ -679,7 +679,7 @@
- struct fec_parms *p = (struct fec_parms *)p_vp; /* VR */
- #endif /* CPLUSPLUS_COMPATIBLE */
- if (p==NULL ||
-- p->magic != ( ( (FEC_MAGIC ^ p->k) ^ p->n) ^ (int)(p->enc_matrix)) ) {
-+ p->magic != ( ( (FEC_MAGIC ^ p->k) ^ p->n) ^ (intptr_t)(p->enc_matrix)) ) {
- PRINT_ERR((mcl_stderr, "bad parameters to fec_free\n"))
- return ;
- }
-@@ -715,7 +715,7 @@
- retval->k = k ;
- retval->n = n ;
- retval->enc_matrix = NEW_GF_MATRIX(n, k);
-- retval->magic = ( ( FEC_MAGIC ^ k) ^ n) ^ (int)(retval->enc_matrix) ;
-+ retval->magic = ( ( FEC_MAGIC ^ k) ^ n) ^ (intptr_t)(retval->enc_matrix) ;
- tmp_m = NEW_GF_MATRIX(n, k);
- /*
- * fill the matrix with powers of field elements, starting from 0.
diff --git a/net/mcl/files/patch-test_abort.c b/net/mcl/files/patch-test_abort.c
deleted file mode 100644
index ad1116943ab0..000000000000
--- a/net/mcl/files/patch-test_abort.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_abort.c.orig Tue Jul 22 19:37:39 2003
-+++ check/alc/test_abort.c Wed Oct 15 17:10:42 2003
-@@ -26,6 +26,10 @@
- #include <stdio.h>
- #include <stdlib.h> /* for exit */
-
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #include <io.h>
diff --git a/net/mcl/files/patch-test_demux_label1_rx.c b/net/mcl/files/patch-test_demux_label1_rx.c
deleted file mode 100644
index d172c016a3b0..000000000000
--- a/net/mcl/files/patch-test_demux_label1_rx.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_demux_label1_rx.c.orig Tue Jul 22 19:37:39 2003
-+++ check/alc/test_demux_label1_rx.c Wed Oct 15 17:13:17 2003
-@@ -26,6 +26,10 @@
-
- #include <stdio.h>
-
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_demux_label1_tx.c b/net/mcl/files/patch-test_demux_label1_tx.c
deleted file mode 100644
index 57e1efe5f915..000000000000
--- a/net/mcl/files/patch-test_demux_label1_tx.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_demux_label1_tx.c.orig Tue Jul 22 19:37:39 2003
-+++ check/alc/test_demux_label1_tx.c Wed Oct 15 17:12:56 2003
-@@ -25,6 +25,10 @@
-
- #include <stdio.h>
-
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_dyn_tsi.c b/net/mcl/files/patch-test_dyn_tsi.c
deleted file mode 100644
index bf09722b074f..000000000000
--- a/net/mcl/files/patch-test_dyn_tsi.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_dyn_tsi.c.orig Tue Jul 22 19:37:39 2003
-+++ check/alc/test_dyn_tsi.c Wed Oct 15 17:13:37 2003
-@@ -30,6 +30,10 @@
-
- #include <stdio.h>
-
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_multi_sessions1.c b/net/mcl/files/patch-test_multi_sessions1.c
deleted file mode 100644
index 0b0af22dd2b1..000000000000
--- a/net/mcl/files/patch-test_multi_sessions1.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- check/alc/test_multi_sessions1.c.orig Tue Jul 22 19:37:39 2003
-+++ check/alc/test_multi_sessions1.c Wed Oct 15 17:11:53 2003
-@@ -24,6 +24,11 @@
- */
-
- #include <stdio.h>
-+
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_multi_sessions2.c b/net/mcl/files/patch-test_multi_sessions2.c
deleted file mode 100644
index 0033a72b5a86..000000000000
--- a/net/mcl/files/patch-test_multi_sessions2.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- check/alc/test_multi_sessions2.c.orig Tue Jul 22 19:37:39 2003
-+++ check/alc/test_multi_sessions2.c Wed Oct 15 17:12:13 2003
-@@ -25,6 +25,11 @@
- */
-
- #include <stdio.h>
-+
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #include <io.h>
diff --git a/net/mcl/files/patch-test_no_tx.c b/net/mcl/files/patch-test_no_tx.c
deleted file mode 100644
index e6f1e0b90d83..000000000000
--- a/net/mcl/files/patch-test_no_tx.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_no_tx.c.orig Tue Jul 22 19:37:39 2003
-+++ check/alc/test_no_tx.c Wed Oct 15 17:10:20 2003
-@@ -25,6 +25,10 @@
-
- #include <stdio.h>
-
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_rebootable_client.c b/net/mcl/files/patch-test_rebootable_client.c
deleted file mode 100644
index 9ee9725b77a9..000000000000
--- a/net/mcl/files/patch-test_rebootable_client.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_rebootable_client.c.orig Tue Jul 22 19:37:39 2003
-+++ check/alc/test_rebootable_client.c Wed Oct 15 17:18:38 2003
-@@ -35,6 +35,10 @@
- #include <stdio.h>
- #include <string.h>
-
-+#ifdef FREEBSD
-+#include <sys/time.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_seq_of_tx_sessions.c b/net/mcl/files/patch-test_seq_of_tx_sessions.c
deleted file mode 100644
index 31d967ca431e..000000000000
--- a/net/mcl/files/patch-test_seq_of_tx_sessions.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- check/alc/test_seq_of_tx_sessions.c.orig Tue Jul 22 19:37:39 2003
-+++ check/alc/test_seq_of_tx_sessions.c Wed Oct 15 17:11:13 2003
-@@ -25,6 +25,11 @@
- */
-
- #include <stdio.h>
-+
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_several_fec_codecs.c b/net/mcl/files/patch-test_several_fec_codecs.c
deleted file mode 100644
index 34da7be64644..000000000000
--- a/net/mcl/files/patch-test_several_fec_codecs.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_several_fec_codecs.c.orig Tue Jul 22 19:37:39 2003
-+++ check/alc/test_several_fec_codecs.c Wed Oct 15 17:05:40 2003
-@@ -28,6 +28,10 @@
-
- #include <stdio.h>
-
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_vtm_rx.c b/net/mcl/files/patch-test_vtm_rx.c
deleted file mode 100644
index a0cf05b33306..000000000000
--- a/net/mcl/files/patch-test_vtm_rx.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_vtm_rx.c.orig Tue Jul 22 19:37:39 2003
-+++ check/alc/test_vtm_rx.c Wed Oct 15 17:14:28 2003
-@@ -27,6 +27,10 @@
-
- #include <stdio.h>
-
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_vtm_tx.c b/net/mcl/files/patch-test_vtm_tx.c
deleted file mode 100644
index 8d26b0f60d2d..000000000000
--- a/net/mcl/files/patch-test_vtm_tx.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_vtm_tx.c.orig Tue Jul 22 19:37:39 2003
-+++ check/alc/test_vtm_tx.c Wed Oct 15 17:14:02 2003
-@@ -25,6 +25,10 @@
-
- #include <stdio.h>
-
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/files/patch-test_wait_rx_receiver.c b/net/mcl/files/patch-test_wait_rx_receiver.c
deleted file mode 100644
index c03c4a4be206..000000000000
--- a/net/mcl/files/patch-test_wait_rx_receiver.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- check/alc/test_wait_rx_receiver.c.orig Tue Jul 22 19:37:39 2003
-+++ check/alc/test_wait_rx_receiver.c Wed Oct 15 17:09:56 2003
-@@ -27,6 +27,9 @@
- #include <stdio.h>
-
-
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-
- #ifdef WIN32
- #include <winsock2.h>
diff --git a/net/mcl/files/patch-test_wait_rx_sender.c b/net/mcl/files/patch-test_wait_rx_sender.c
deleted file mode 100644
index 694af55beed3..000000000000
--- a/net/mcl/files/patch-test_wait_rx_sender.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- check/alc/test_wait_rx_sender.c.orig Tue Jul 22 19:37:39 2003
-+++ check/alc/test_wait_rx_sender.c Wed Oct 15 17:09:33 2003
-@@ -27,6 +27,9 @@
- #include <stdio.h>
-
-
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-
- #ifdef WIN32
- #include <winsock2.h>
diff --git a/net/mcl/files/patch-test_wait_tx.c b/net/mcl/files/patch-test_wait_tx.c
deleted file mode 100644
index b0b816cc8cd8..000000000000
--- a/net/mcl/files/patch-test_wait_tx.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- check/alc/test_wait_tx.c.orig Tue Jul 22 19:37:39 2003
-+++ check/alc/test_wait_tx.c Wed Oct 15 17:09:00 2003
-@@ -25,6 +25,10 @@
-
- #include <stdio.h>
-
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif
-+
- #ifdef WIN32
- #include <winsock2.h>
- #else
diff --git a/net/mcl/pkg-descr b/net/mcl/pkg-descr
deleted file mode 100644
index d3de44a68c11..000000000000
--- a/net/mcl/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-This is a port of MCLv3, an open source implementation of the ALC and
-NORM Reliable Multicast Protocols.
-
-The MCLv3 project is an Open-Source GNU/GPL, multi-platform
-implementation of the two major reliable multicast protocols being
-standardized by the RMT IETF working group: ALC/LCT and NORM. It is
-composed of a C/C++ library and several applications built on top of it
-and provides an easy-to-use and integrated solution for reliable and
-highly scalable multicast delivery of data.
-
-WWW: http://www.inrialpes.fr/planete/people/roca/mcl/mcl.html
diff --git a/net/mcl/pkg-plist b/net/mcl/pkg-plist
deleted file mode 100644
index 2e3b802a574e..000000000000
--- a/net/mcl/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/fcast
-bin/flute
-bin/robcast_client
-bin/robcast_server
-lib/libmclalc.a
-include/mcl_lib_api.h
-include/alc/mcl_lib_api_alc.h
-@dirrm include/alc