Attachment #44072 for bug #68320

View | Details | Raw Unified | Return to bug 68320
Collapse All | Expand All

Lines 6-12 Link Here

(-)mad_fcl/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= mad_fcl	8	PORTNAME= mad_fcl
9	PORTVERSION= 0.8	9	PORTVERSION= 1.0
10	CATEGORIES= net ipv6	10	CATEGORIES= net ipv6
11	MASTER_SITES= http://www.atm.tut.fi/mad/download/	11	MASTER_SITES= http://www.atm.tut.fi/mad/download/
12	DISTNAME= ${PORTNAME}_v${PORTVERSION}_src	12	DISTNAME= ${PORTNAME}_v${PORTVERSION}_src

Lines 1-2 Link Here

(-)mad_fcl/distinfo (-2 / +2 lines)
1	MD5 (mad_fcl_v0.8_src.tar.gz) = edda929301c4d6e05dd18844760ed0be	1	MD5 (mad_fcl_v1.0_src.tar.gz) = 3df59ac9474b375e500df6f18405db66
2	SIZE (mad_fcl_v0.8_src.tar.gz) = 119204	2	SIZE (mad_fcl_v1.0_src.tar.gz) = 134687

Lines 1-6 Link Here

(-)mad_fcl/files/patch-Makefile (-3 / +74 lines)
1	--- Makefile.orig Fri Feb 13 15:58:54 2004	1
2	+++ Makefile Fri Feb 13 15:58:54 2004	2	$FreeBSD$
3	@@ -4,21 +4,21 @@	3
		4	--- Makefile.orig Fri Jun 25 13:16:29 2004
		5	+++ Makefile Fri Jun 25 13:17:58 2004
		6	@@ -4,78 +4,78 @@
4	@echo "-------------------"	7	@echo "-------------------"
5	@echo "* ALC library *"	8	@echo "* ALC library *"
6	@echo "-------------------"	9	@echo "-------------------"
Lines 16-21 Link Here
16	+ mkdir lib; cd sdplib; gmake clean; gmake	19	+ mkdir lib; cd sdplib; gmake clean; gmake
17	@echo "done"	20	@echo "done"
18		21
		22	nullfeclib ::
		23	@echo "-------------------"
		24	@echo "* Null-FEC library *"
		25	@echo "-------------------"
		26	- mkdir lib; cd nullfeclib; make clean; make
		27	+ mkdir lib; cd nullfeclib; gmake clean; gmake
		28	@echo "done"
		29
		30	xorfeclib ::
		31	@echo "-------------------"
		32	@echo "* Simple XOR FEC library *"
		33	@echo "-------------------"
		34	- mkdir lib; cd xorfeclib; make clean; make
		35	+ mkdir lib; cd xorfeclib; gmake clean; gmake
		36	@echo "done"
		37
		38	rsfeclib ::
		39	@echo "-------------------"
		40	@echo "* Reed-Solomon FEC library *"
		41	@echo "-------------------"
		42	- mkdir lib; cd rsfeclib; make clean; make
		43	+ mkdir lib; cd rsfeclib; gmake clean; gmake
		44	@echo "done"
		45
		46	rlclib ::
		47	@echo "-------------------"
		48	@echo "* RLC library *"
		49	@echo "-------------------"
		50	- mkdir lib; cd rlclib; make clean; make
		51	+ mkdir lib; cd rlclib; gmake clean; gmake
		52	@echo "done"
		53
19	flute ::	54	flute ::
20	@echo "-------------------------"	55	@echo "-------------------------"
21	@echo "* flute application *"	56	@echo "* flute application *"
Lines 25-27 Link Here
25	@echo "done"	60	@echo "done"
26		61
27	clean :	62	clean :
		63	@echo "----------------------------"
		64	@echo "* Cleaning ALC library *"
		65	@echo "----------------------------"
		66	- cd alclib; make clean
		67	+ cd alclib; gmake clean
		68	@echo "----------------------------"
		69	@echo "* Cleaning SDP library *"
		70	@echo "----------------------------"
		71	- cd sdplib; make clean
		72	+ cd sdplib; gmake clean
		73	@echo "----------------------------"
		74	@echo "* Cleaning Null-FEC library *"
		75	@echo "----------------------------"
		76	- cd nullfeclib; make clean
		77	+ cd nullfeclib; gmake clean
		78	@echo "----------------------------"
		79	@echo "* Cleaning Simple XOR FEC library *"
		80	@echo "----------------------------"
		81	- cd nullfeclib; make clean
		82	+ cd nullfeclib; gmake clean
		83	@echo "----------------------------"
		84	@echo "* Cleaning Reed-Solomon FEC library *"
		85	@echo "----------------------------"
		86	- cd rsfeclib; make clean
		87	+ cd rsfeclib; gmake clean
		88	@echo "----------------------------"
		89	@echo "* Cleaning RLC library *"
		90	@echo "----------------------------"
		91	- cd rlclib; make clean
		92	+ cd rlclib; gmake clean
		93	@echo "----------------------------------"
		94	@echo "* Cleaning flute application *"
		95	@echo "----------------------------------"
		96	- cd flute; make clean
		97	+ cd flute; gmake clean
		98	@echo "done"





$FreeBSD: ports/net/mad_fcl/files/patch-alclib::Makefile,v 1.2 2004/04/30 08:21:26 krion Exp $

--- 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




--- 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





$FreeBSD$

--- 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 compression library */
-#define USE_ZLIB
+/*#define USE_ZLIB */
 





$FreeBSD: ports/net/mad_fcl/files/patch-flute::Makefile,v 1.2 2004/04/30 08:21:26 krion Exp $

--- 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
 

Lines 1-10 Link Here

(-)mad_fcl/files/patch-sdplib::Makefile (-10 lines)
1	--- sdplib/Makefile.orig Fri Feb 13 15:58:54 2004
2	+++ sdplib/Makefile Fri Feb 13 15:58:54 2004
3	@@ -1,6 +1,6 @@
4	#CC = ccmalloc gcc-2.95
5	CC = gcc
6	-CFLAGS += -Wall -g -fPIC -DLINUX -D__VXWORKS_OS__
7	+CFLAGS += -Wall -g -fPIC -DLINUX -O -D__VXWORKS_OS__
8
9	SOURCES = port_list.c port_misc.c sdp_accessor.c sdp_rfc2327.c sdplib.c
10




--- sdplib/port_misc.c.orig	Fri Feb 13 15:58:54 2004
+++ sdplib/port_misc.c	Fri Feb 13 15:58:54 2004
@@ -47,6 +47,7 @@
 #  include <sys/unistd.h>
 #endif
 
+#define HAVE_UNISTD_H
 #if defined (HAVE_UNISTD_H)
 #  include <unistd.h>
 #endif
@@ -55,6 +56,9 @@
 #  include <syslog.h>
 #endif
 
+#include <sys/types.h>
+#include <sys/time.h>
+#define HAVE_SYS_SELECT_H
 #if defined (HAVE_SYS_SELECT_H)
 #  include <sys/select.h>
 #endif





$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
 
+#define HAVE_UNISTD_H
 #if defined (HAVE_UNISTD_H)
 #  include <unistd.h>
 #endif
@@ -55,6 +56,9 @@
 #  include <syslog.h>
 #endif
 
+#include <sys/types.h>
+#include <sys/time.h>
+#define HAVE_SYS_SELECT_H
 #if defined (HAVE_SYS_SELECT_H)
 #  include <sys/select.h>
 #endif

Return to bug 68320

Lines 1-13 Link Here

(-)mad_fcl/files/patch-alclib::Makefile (-13 lines)
1
2	$FreeBSD: ports/net/mad_fcl/files/patch-alclib::Makefile,v 1.2 2004/04/30 08:21:26 krion Exp $
3
4	--- alclib/Makefile.orig Wed Apr 28 16:17:34 2004
5	+++ alclib/Makefile Wed Apr 28 16:18:36 2004
6	@@ -1,6 +1,6 @@
7	#CC = ccmalloc gcc-2.95
8	CC = gcc
9	-CFLAGS += -Wall -g -fPIC -DLINUX
10	+CFLAGS += -Wall -g -O -fPIC -DLINUX
11
12	SOURCES = alc_channel.c alc_hdr.c alc_rx.c alc_session.c alc_socket.c alc_tx.c \
13	lct_hdr.c mad.c mad_rlc.c transport.c blocking_alg.c fec.c null_fec.c rs_fec.c

Lines 1-22 Link Here

(-)mad_fcl/files/patch-alclib::fec.c (-22 lines)
1	--- alclib/fec.c.orig Fri Feb 13 15:58:54 2004
2	+++ alclib/fec.c Fri Feb 13 15:58:54 2004
3	@@ -268,8 +268,7 @@
4	return p ;
5	}
6
7	-#define NEW_GF_MATRIX(rows, cols) \
8	- (gf )my_malloc(rows cols * sizeof(gf), " ## __LINE__ ## " )
9	+#define NEW_GF_MATRIX(rows, cols) (gf )my_malloc(rows cols * sizeof(gf), " ## __LINE__ ## " )
10
11	/*
12	* initialize the data structures used for computations in GF.
13	@@ -350,8 +349,7 @@
14	*
15	* Note that gcc on
16	*/
17	-#define addmul(dst, src, c, sz) \
18	- if (c != 0) addmul1(dst, src, c, sz)
19	+#define addmul(dst, src, c, sz) if (c != 0) addmul1(dst, src, c, sz)
20
21	#define UNROLL 16 /* 1, 4, 8, 16 */
22	static void

Lines 1-12 Link Here

(-)mad_fcl/files/patch-alclib_defines.h (-6 / +6 lines)
1		1
2	$FreeBSD: ports/net/mad_fcl/files/patch-alclib_defines.h,v 1.1 2004/04/30 08:21:26 krion Exp $	2	$FreeBSD$
3		3
4	--- alclib/defines.h.orig Wed Apr 28 16:48:02 2004	4	--- alclib/defines.h.orig Fri Jun 25 13:18:59 2004
5	+++ alclib/defines.h Wed Apr 28 16:48:28 2004	5	+++ alclib/defines.h Fri Jun 25 13:35:11 2004
6	@@ -32,7 +32,7 @@	6	@@ -29,7 +29,7 @@
7	/#define SSM/	7	#define SSM
8		8
9	/* Use ZLIB comprsession library */	9	/* Use ZLIB compression library */
10	-#define USE_ZLIB	10	-#define USE_ZLIB
11	+/#define USE_ZLIB /	11	+/#define USE_ZLIB /
12		12

Lines 1-19 Link Here

(-)mad_fcl/files/patch-flute::Makefile (-19 lines)
1
2	$FreeBSD: ports/net/mad_fcl/files/patch-flute::Makefile,v 1.2 2004/04/30 08:21:26 krion Exp $
3
4	--- flute/Makefile.orig Wed Apr 28 16:49:19 2004
5	+++ flute/Makefile Wed Apr 28 16:51:03 2004
6	@@ -1,9 +1,9 @@
7	#CC = ccmalloc gcc-2.95
8	CC = gcc
9	-CFLAGS += -Wall -g -I/usr/local/expat-1.95.6/lib/ -I/usr/local/ssl/include/ -I/usr/java/j2sdk1.4.2/include/ \
10	- -I/usr/local/include/ -I/usr/java/j2sdk1.4.2/include/linux/ -DLINUX -D__VXWORKS_OS__
11	-LFLAGS += -DLINUX -D__VXWORKS_OS__ -L../lib -L/usr/local/expat-1.95.6/.libs/ -L/usr/local/ssl/lib/ \
12	- -L/usr/local/lib/ -lz -lalc -lsdp -lexpat -lpthread -lm -lssl -lcrypto # -lmpatrol -lelf
13	+CFLAGS += -Wall -g -I/usr/local/include/ \
14	+ -DLINUX -D__VXWORKS_OS__
15	+LFLAGS += -DLINUX -D__VXWORKS_OS__ -L../lib \
16	+ -L/usr/local/lib/ -lz -lalc -lsdp -lexpat -lm -lpthread -lssl -lcrypto # -lmpatrol -lelf
17
18	SOURCES = main.c flute.c sender.c receiver.c fdt.c fdt_gen.c mad_md5.c uri.c getdnsname.c mad_zlib.c
19

Lines 1-20 Link Here

(-)mad_fcl/files/patch-sdplib::port_misc.c (-20 lines)
1	--- sdplib/port_misc.c.orig Fri Feb 13 15:58:54 2004
2	+++ sdplib/port_misc.c Fri Feb 13 15:58:54 2004
3	@@ -47,6 +47,7 @@
4	# include <sys/unistd.h>
5	#endif
6
7	+#define HAVE_UNISTD_H
8	#if defined (HAVE_UNISTD_H)
9	# include <unistd.h>
10	#endif
11	@@ -55,6 +56,9 @@
12	# include <syslog.h>
13	#endif
14
15	+#include <sys/types.h>
16	+#include <sys/time.h>
17	+#define HAVE_SYS_SELECT_H
18	#if defined (HAVE_SYS_SELECT_H)
19	# include <sys/select.h>
20	#endif

Line 0 Link Here

(-)mad_fcl/files/patch-sdplib_port__misc.c (+23 lines)
	1
	2	$FreeBSD$
	3
	4	--- sdplib/port_misc.c.orig Fri Jun 25 13:29:37 2004
	5	+++ sdplib/port_misc.c Fri Jun 25 13:31:13 2004
	6	@@ -47,6 +47,7 @@
	7	# include <sys/unistd.h>
	8	#endif
	9
	10	+#define HAVE_UNISTD_H
	11	#if defined (HAVE_UNISTD_H)
	12	# include <unistd.h>
	13	#endif
	14	@@ -55,6 +56,9 @@
	15	# include <syslog.h>
	16	#endif
	17
	18	+#include <sys/types.h>
	19	+#include <sys/time.h>
	20	+#define HAVE_SYS_SELECT_H
	21	#if defined (HAVE_SYS_SELECT_H)
	22	# include <sys/select.h>
	23	#endif