- Update to version 0.8

PR:		ports/66050
Submitted by:	maintainer

6 files changed, 39 insertions, 51 deletions

diff --git a/net/mad_fcl/Makefile b/net/mad_fcl/Makefile
index 933c623a5460..8cda01edb5f2 100644
--- a/net/mad_fcl/Makefile
+++ b/net/mad_fcl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mad_fcl
-PORTVERSION=	0.6
-PORTREVISION=	1
+PORTVERSION=	0.8
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.atm.tut.fi/mad/download/
 DISTNAME=	${PORTNAME}_v${PORTVERSION}_src
@@ -31,7 +30,7 @@ pre-patch:
 			${CAT} $$f.noms > $$f && ${RM} $$f.noms; done
 
 post-patch:
-	${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
+	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/flute/Makefile
 
 do-install:
diff --git a/net/mad_fcl/distinfo b/net/mad_fcl/distinfo
index 1f4fe77984b8..d6897dd38598 100644
--- a/net/mad_fcl/distinfo
+++ b/net/mad_fcl/distinfo
@@ -1,2 +1,2 @@
-MD5 (mad_fcl_v0.6_src.tar.gz) = 3a6aa16450a2e38b5bb3f6a02df11915
-SIZE (mad_fcl_v0.6_src.tar.gz) = 103261
+MD5 (mad_fcl_v0.8_src.tar.gz) = edda929301c4d6e05dd18844760ed0be
+SIZE (mad_fcl_v0.8_src.tar.gz) = 119204
diff --git a/net/mad_fcl/files/patch-alclib::Makefile b/net/mad_fcl/files/patch-alclib::Makefile
index 33aa0ffc6833..ef3350445790 100644
--- a/net/mad_fcl/files/patch-alclib::Makefile
+++ b/net/mad_fcl/files/patch-alclib::Makefile
@@ -1,11 +1,13 @@
---- alclib/Makefile.orig	Fri Feb 13 15:58:54 2004
-+++ alclib/Makefile	Fri Feb 13 15:58:54 2004
-@@ -1,7 +1,7 @@
+
+$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 = g++
  CC = gcc
 -CFLAGS += -Wall -g -fPIC -DLINUX
-+CFLAGS += -Wall -g -fPIC -O -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_cc.c transport.c blocking_alg.c fec.c null_fec.c rs_fec.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_defines.h b/net/mad_fcl/files/patch-alclib_defines.h
new file mode 100644
index 000000000000..de5602b00823
--- /dev/null
+++ b/net/mad_fcl/files/patch-alclib_defines.h
@@ -0,0 +1,14 @@
+
+$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*/
+ 
+ /* Use ZLIB comprsession library */
+-#define USE_ZLIB
++/*#define USE_ZLIB */
+ 
+ /* Use  OpenSSL library for MD5*/
+ #define USE_OPENSSL
diff --git a/net/mad_fcl/files/patch-flute::Makefile b/net/mad_fcl/files/patch-flute::Makefile
index 8a7e8401f0fd..0527e26dc00f 100644
--- a/net/mad_fcl/files/patch-flute::Makefile
+++ b/net/mad_fcl/files/patch-flute::Makefile
@@ -1,17 +1,19 @@
---- flute/Makefile.orig	Fri Feb 13 15:58:54 2004
-+++ flute/Makefile	Fri Feb 13 15:58:54 2004
-@@ -1,10 +1,10 @@
+
+$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 = g++
  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/java/j2sdk1.4.2/include/linux/ -DLINUX -D__VXWORKS_OS__
+-	-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/ \
--	-lalc -lsdp -lexpat -lpthread -lm -lssl -lcrypto #-lmpatrol -lelf
-+CFLAGS += -Wall -g -O -I/usr/local/include/ \
-+	 -DLINUX -D__VXWORKS_OS__
-+LFLAGS += -DLINUX -pthread -L../lib -L/usr/local/lib \
-+	-lalc -lsdp -lexpat -lm -lssl -lcrypto #-lmpatrol -lelf
+-	-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
+ 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-flute::fdt.c b/net/mad_fcl/files/patch-flute::fdt.c
deleted file mode 100644
index 3272813fbe43..000000000000
--- a/net/mad_fcl/files/patch-flute::fdt.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- flute/fdt.c.orig	Wed Mar  3 12:48:53 2004
-+++ flute/fdt.c	Wed Mar  3 12:49:38 2004
-@@ -114,7 +114,7 @@
- #ifdef WIN32     
- 				file->file_len = _atoi64(*(++atts));
- #else               
--				file->file_len = atoll(*(++atts));				
-+				file->file_len = strtoll(*(++atts), NULL, 10);				
- #endif
- 				if(file->toi_len == 0) {
- 					file->toi_len = file->file_len;
-@@ -125,7 +125,7 @@
- #ifdef WIN32			  
- 				file->toi_len = _atoi64(*(++atts));
- #else
--				file->toi_len = atoll(*(++atts));
-+				file->toi_len = strtoll(*(++atts), NULL, 10);
- #endif 
- 			}
- 			else if(!strcmp(*atts, "Content-Type")) {
-@@ -184,7 +184,7 @@
- #ifdef WIN32
- 				fdt->expires = _atoi64(*(++atts));
- #else
--				fdt->expires = atoll(*(++atts));
-+				fdt->expires = strtoll(*(++atts), NULL, 10);
- #endif
- 			}
- 			else if(!strcmp(*atts, "Complete")) {