9 files changed, 87 insertions, 77 deletions

diff --git a/net/mad_fcl/Makefile b/net/mad_fcl/Makefile
index 8cda01edb5f2..85ca1ad80e0f 100644
--- a/net/mad_fcl/Makefile
+++ b/net/mad_fcl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mad_fcl
-PORTVERSION=	0.8
+PORTVERSION=	1.0
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.atm.tut.fi/mad/download/
 DISTNAME=	${PORTNAME}_v${PORTVERSION}_src
diff --git a/net/mad_fcl/distinfo b/net/mad_fcl/distinfo
index d6897dd38598..01afb34ed97b 100644
--- a/net/mad_fcl/distinfo
+++ b/net/mad_fcl/distinfo
@@ -1,2 +1,2 @@
-MD5 (mad_fcl_v0.8_src.tar.gz) = edda929301c4d6e05dd18844760ed0be
-SIZE (mad_fcl_v0.8_src.tar.gz) = 119204
+MD5 (mad_fcl_v1.0_src.tar.gz) = 3df59ac9474b375e500df6f18405db66
+SIZE (mad_fcl_v1.0_src.tar.gz) = 134687
diff --git a/net/mad_fcl/files/patch-Makefile b/net/mad_fcl/files/patch-Makefile
index 8a84c913c998..a2facb4430e5 100644
--- a/net/mad_fcl/files/patch-Makefile
+++ b/net/mad_fcl/files/patch-Makefile
@@ -1,6 +1,9 @@
---- Makefile.orig	Fri Feb 13 15:58:54 2004
-+++ Makefile	Fri Feb 13 15:58:54 2004
-@@ -4,21 +4,21 @@
+
+$FreeBSD$
+
+--- Makefile.orig	Fri Jun 25 13:16:29 2004
++++ Makefile	Fri Jun 25 13:17:58 2004
+@@ -4,78 +4,78 @@
  	@echo "-------------------"
  	@echo "*** ALC library ***"
  	@echo "-------------------"
@@ -16,6 +19,38 @@
 +	mkdir lib; cd sdplib; gmake clean; gmake                   
  	@echo "done"
  
+ nullfeclib ::
+ 	@echo "-------------------"
+ 	@echo "*** Null-FEC library ***"
+ 	@echo "-------------------"
+-	mkdir lib; cd nullfeclib; make clean; make
++	mkdir lib; cd nullfeclib; gmake clean; gmake
+ 	@echo "done"
+ 
+ xorfeclib ::
+ 	@echo "-------------------"
+ 	@echo "*** Simple XOR FEC library ***"
+ 	@echo "-------------------"
+-	mkdir lib; cd xorfeclib; make clean; make
++	mkdir lib; cd xorfeclib; gmake clean; gmake
+ 	@echo "done"
+ 
+ rsfeclib ::
+ 	@echo "-------------------"
+ 	@echo "*** Reed-Solomon FEC library ***"
+ 	@echo "-------------------"
+-	mkdir lib; cd rsfeclib; make clean; make
++	mkdir lib; cd rsfeclib; gmake clean; gmake
+ 	@echo "done"
+ 
+ rlclib ::
+ 	@echo "-------------------"
+ 	@echo "*** RLC library ***"
+ 	@echo "-------------------"
+-	mkdir lib; cd rlclib; make clean; make
++	mkdir lib; cd rlclib; gmake clean; gmake
+ 	@echo "done"
+ 
  flute ::
  	@echo "-------------------------"
  	@echo "*** flute application ***"
@@ -25,3 +60,39 @@
  	@echo "done"
  
  clean :
+ 	@echo "----------------------------"
+ 	@echo "*** Cleaning ALC library ***"
+ 	@echo "----------------------------"
+-	cd alclib; make clean
++	cd alclib; gmake clean
+ 	@echo "----------------------------"
+ 	@echo "*** Cleaning SDP library ***"
+ 	@echo "----------------------------"
+-	cd sdplib; make clean
++	cd sdplib; gmake clean
+ 	@echo "----------------------------"
+ 	@echo "*** Cleaning Null-FEC library ***"
+ 	@echo "----------------------------"
+-	cd nullfeclib; make clean
++	cd nullfeclib; gmake clean
+ 	@echo "----------------------------"
+ 	@echo "*** Cleaning Simple XOR FEC library ***"
+ 	@echo "----------------------------"
+-	cd nullfeclib; make clean
++	cd nullfeclib; gmake clean
+ 	@echo "----------------------------"
+ 	@echo "*** Cleaning Reed-Solomon FEC library ***"
+ 	@echo "----------------------------"
+-	cd rsfeclib; make clean
++	cd rsfeclib; gmake clean
+ 	@echo "----------------------------"
+ 	@echo "*** Cleaning RLC library ***"
+ 	@echo "----------------------------"
+-	cd rlclib; make clean
++	cd rlclib; gmake clean
+ 	@echo "----------------------------------"
+ 	@echo "*** Cleaning flute application ***"
+ 	@echo "----------------------------------"
+-	cd flute; make clean
++	cd flute; gmake clean
+ 	@echo "done"
diff --git a/net/mad_fcl/files/patch-alclib::Makefile b/net/mad_fcl/files/patch-alclib::Makefile
deleted file mode 100644
index ef3350445790..000000000000
--- a/net/mad_fcl/files/patch-alclib::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- alclib/Makefile.orig	Wed Apr 28 16:17:34 2004
-+++ alclib/Makefile	Wed Apr 28 16:18:36 2004
-@@ -1,6 +1,6 @@
- #CC = ccmalloc gcc-2.95
- CC = gcc
--CFLAGS += -Wall -g -fPIC -DLINUX
-+CFLAGS += -Wall -g -O -fPIC -DLINUX
- 
- SOURCES = alc_channel.c alc_hdr.c alc_rx.c alc_session.c alc_socket.c alc_tx.c \
- 	lct_hdr.c mad.c mad_rlc.c transport.c blocking_alg.c fec.c null_fec.c rs_fec.c
diff --git a/net/mad_fcl/files/patch-alclib::fec.c b/net/mad_fcl/files/patch-alclib::fec.c
deleted file mode 100644
index b1a234046f6b..000000000000
--- a/net/mad_fcl/files/patch-alclib::fec.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- alclib/fec.c.orig	Fri Feb 13 15:58:54 2004
-+++ alclib/fec.c	Fri Feb 13 15:58:54 2004
-@@ -268,8 +268,7 @@
-     return p ;
- }
- 
--#define NEW_GF_MATRIX(rows, cols) \
--    (gf *)my_malloc(rows * cols * sizeof(gf), " ## __LINE__ ## " )
-+#define NEW_GF_MATRIX(rows, cols) (gf *)my_malloc(rows * cols * sizeof(gf), " ## __LINE__ ## " )
- 
- /*
-  * initialize the data structures used for computations in GF.
-@@ -350,8 +349,7 @@
-  * 
-  * Note that gcc on
-  */
--#define addmul(dst, src, c, sz) \
--    if (c != 0) addmul1(dst, src, c, sz)
-+#define addmul(dst, src, c, sz)  if (c != 0) addmul1(dst, src, c, sz)
- 
- #define UNROLL 16 /* 1, 4, 8, 16 */
- static void
diff --git a/net/mad_fcl/files/patch-alclib_defines.h b/net/mad_fcl/files/patch-alclib_defines.h
index de5602b00823..ba89adc73150 100644
--- a/net/mad_fcl/files/patch-alclib_defines.h
+++ b/net/mad_fcl/files/patch-alclib_defines.h
@@ -1,12 +1,12 @@
 
 $FreeBSD$
 
---- alclib/defines.h.orig	Wed Apr 28 16:48:02 2004
-+++ alclib/defines.h	Wed Apr 28 16:48:28 2004
-@@ -32,7 +32,7 @@
- /*#define SSM*/
+--- alclib/defines.h.orig	Fri Jun 25 13:18:59 2004
++++ alclib/defines.h	Fri Jun 25 13:35:11 2004
+@@ -29,7 +29,7 @@
+ #define SSM
  
- /* Use ZLIB comprsession library */
+ /* Use ZLIB compression library */
 -#define USE_ZLIB
 +/*#define USE_ZLIB */
  
diff --git a/net/mad_fcl/files/patch-flute::Makefile b/net/mad_fcl/files/patch-flute::Makefile
deleted file mode 100644
index 0527e26dc00f..000000000000
--- a/net/mad_fcl/files/patch-flute::Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-
-$FreeBSD$
-
---- flute/Makefile.orig	Wed Apr 28 16:49:19 2004
-+++ flute/Makefile	Wed Apr 28 16:51:03 2004
-@@ -1,9 +1,9 @@
- #CC = ccmalloc gcc-2.95
- CC = gcc
--CFLAGS += -Wall -g -I/usr/local/expat-1.95.6/lib/ -I/usr/local/ssl/include/ -I/usr/java/j2sdk1.4.2/include/ \
--	-I/usr/local/include/ -I/usr/java/j2sdk1.4.2/include/linux/ -DLINUX -D__VXWORKS_OS__
--LFLAGS += -DLINUX -D__VXWORKS_OS__ -L../lib -L/usr/local/expat-1.95.6/.libs/ -L/usr/local/ssl/lib/ \
--	-L/usr/local/lib/ -lz -lalc -lsdp -lexpat -lpthread -lm -lssl -lcrypto # -lmpatrol -lelf
-+CFLAGS += -Wall -g -I/usr/local/include/  \
-+	-DLINUX -D__VXWORKS_OS__
-+LFLAGS += -DLINUX -D__VXWORKS_OS__ -L../lib \
-+	-L/usr/local/lib/ -lz -lalc -lsdp -lexpat -lm -lpthread -lssl -lcrypto # -lmpatrol -lelf
- 
- SOURCES = main.c flute.c sender.c receiver.c fdt.c fdt_gen.c mad_md5.c uri.c getdnsname.c mad_zlib.c
- 
diff --git a/net/mad_fcl/files/patch-sdplib::Makefile b/net/mad_fcl/files/patch-sdplib::Makefile
deleted file mode 100644
index c1ddb7cd497b..000000000000
--- a/net/mad_fcl/files/patch-sdplib::Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- sdplib/Makefile.orig	Fri Feb 13 15:58:54 2004
-+++ sdplib/Makefile	Fri Feb 13 15:58:54 2004
-@@ -1,6 +1,6 @@
- #CC = ccmalloc gcc-2.95
- CC = gcc
--CFLAGS += -Wall -g -fPIC -DLINUX -D__VXWORKS_OS__
-+CFLAGS += -Wall -g -fPIC -DLINUX -O -D__VXWORKS_OS__
- 
- SOURCES = port_list.c port_misc.c sdp_accessor.c sdp_rfc2327.c sdplib.c
- 
diff --git a/net/mad_fcl/files/patch-sdplib::port_misc.c b/net/mad_fcl/files/patch-sdplib_port__misc.c
index f97f8e8cad18..3cff887c699b 100644
--- a/net/mad_fcl/files/patch-sdplib::port_misc.c
+++ b/net/mad_fcl/files/patch-sdplib_port__misc.c
@@ -1,5 +1,8 @@
---- sdplib/port_misc.c.orig	Fri Feb 13 15:58:54 2004
-+++ sdplib/port_misc.c	Fri Feb 13 15:58:54 2004
+
+$FreeBSD$
+
+--- sdplib/port_misc.c.orig	Fri Jun 25 13:29:37 2004
++++ sdplib/port_misc.c	Fri Jun 25 13:31:13 2004
 @@ -47,6 +47,7 @@
  #  include <sys/unistd.h>
  #endif