Attachment #164071 for bug #205215

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




# $FreeBSD: head/net/mad_fcl/Makefile 401096 2015-11-09 12:59:03Z antoine $

PORTNAME=	mad_fcl
PORTVERSION=	1.7
PORTREVISION=	1
CATEGORIES=	net ipv6
MASTER_SITES=	http://mad.cs.tut.fi/download/
DISTNAME=	${PORTNAME}_v${PORTVERSION}_src

MAINTAINER=	ports@FreeBSD.org
COMMENT=	FLUTE - File Delivery over Unidirectional Transport implementation

LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
		libexpat.so:${PORTSDIR}/textproc/expat2

USES=		dos2unix gmake

USES=		gmake
USE_OPENSSL=	yes
MAKE_ENV=	LFLAGS="${LDFLAGS}"
DOC_FILES=	fdt-example.xml flute-sdp-example.sdp

PORTDOCS=	${DOC_FILES} README.TXT
PLIST_FILES=	bin/flute

MAKE_JOBS_UNSAFE= yes

CFLAGS+=	-DHAVE_SYS_TYPES_H -DHAVE_SYS_SELECT_H -DHAVE_UNISTD_H \
		-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib -pthread

PORTDOCS=	README.TXT
PORTEXAMPLES=	fdt-example.xml flute-sdp-example.sdp
PLIST_FILES=	bin/flute bin/multis_flute

OPTIONS_DEFINE=	DOCS EXAMPLES
	# Fixing the end-of-lines:
	@for f in `${FIND} ${WRKSRC}/.. -type f` ; do \
		${TR} -d '\015' < $$f > $$f.noms && \
			${CAT} $$f.noms > $$f && ${RM} $$f.noms; done

post-patch:
	@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
		'/CC/s| =| ?=| ; \
		 s|-O3 -g|| ; \
		 s|-D_ISOC99_SOURCE|| ; \
		 s|-D_XOPEN_SOURCE=500|| ; \
		 s|/usr/local/ssl|${OPENSSLBASE}| ; \
		 s|-I/usr/local/include/boost-1_33_1|| ; \
		 s|-L/usr/local/lib|| ; \
		 s|-lpthread|-lcompat|'
	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
		's|fopen64|fopen| ; \
		 s|ftruncate64|ftruncate| ; \
		 s|lseek64|lseek| ; \
		 s|off64_t|off_t| ; \
		 s|open64|open| ; \
		 s|stat64|stat|'
	@${REINPLACE_CMD} -e \
		'/<curl\/types.h>/d' ${WRKSRC}/flutelib/http_file_repair.h

do-install:
	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} flute multis_flute \
		${STAGEDIR}${PREFIX}/bin)

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \
		${STAGEDIR}${DOCSDIR})

post-install-EXAMPLES-on:
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	(cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTEXAMPLES} \
		${STAGEDIR}${EXAMPLESDIR})

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)net/mad_fcl/distinfo (-2 / +2 lines)
1	SHA256 (mad_fcl_v1.3_src.tar.gz) = 2b41e06128a14ac42aeb58633562b43cb5d0499e2852b91d810f53dbd7e9ba29	1	SHA256 (mad_fcl_v1.7_src.tar.gz) = 97c0abc3807e48b102fee85bf14aaaeabe39ce3f98bb4423daed9651978e62f0
2	SIZE (mad_fcl_v1.3_src.tar.gz) = 129137	2	SIZE (mad_fcl_v1.7_src.tar.gz) = 208408

Lines 1-11 Link Here

(-)net/mad_fcl/files/patch-Makefile (-10 / +54 lines)
1	--- Makefile.orig	1	--- Makefile.orig 2007-01-31 10:09:11 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -4,34 +4,34 @@	3	@@ -1,71 +1,71 @@
		4	-all : alclib sdplib flutelib flute multis_flute flute_unittest
		5	+all : alclib sdplib flutelib flute multis_flute
		6
		7	alclib ::
4	@echo "-------------------"	8	@echo "-------------------"
5	@echo "* ALC library *"	9	@echo "* ALC library *"
6	@echo "-------------------"	10	@echo "-------------------"
7	- mkdir lib; cd alclib; make clean; make	11	- mkdir lib; cd alclib; make clean; make
8	+ mkdir lib; cd alclib; gmake clean; gmake	12	+ mkdir lib; cd alclib; ${MAKE} clean; ${MAKE}
9	@echo "done"	13	@echo "done"
10		14
11	sdplib ::	15	sdplib ::
Lines 13-27 Link Here
13	@echo "* SDP library *"	17	@echo "* SDP library *"
14	@echo "-------------------"	18	@echo "-------------------"
15	- mkdir lib; cd sdplib; make clean; make	19	- mkdir lib; cd sdplib; make clean; make
16	+ mkdir lib; cd sdplib; gmake clean; gmake	20	+ mkdir lib; cd sdplib; ${MAKE} clean; ${MAKE}
		21	@echo "done"
		22
		23	flutelib ::
		24	@echo "---------------------"
		25	@echo "* FLUTE library *"
		26	@echo "---------------------"
		27	- mkdir lib; cd flutelib; make clean; make
		28	+ mkdir lib; cd flutelib; ${MAKE} clean; ${MAKE}
17	@echo "done"	29	@echo "done"
18		30
19	flute ::	31	flute ::
20	@echo "-------------------------"	32	@echo "-------------------------"
21	@echo "* flute application *"	33	@echo "* FLUTE application *"
22	@echo "-------------------------"	34	@echo "-------------------------"
23	- mkdir bin; cd flute; make clean; make	35	- mkdir bin; cd flute; make clean; make
24	+ mkdir bin; cd flute; gmake clean; gmake	36	+ mkdir bin; cd flute; ${MAKE} clean; ${MAKE}
		37	@echo "done"
		38
		39	multis_flute ::
		40	@echo "----------------------------------------------"
		41	@echo "* Example multisession FLUTE application *"
		42	@echo "----------------------------------------------"
		43	- mkdir bin; cd multis_flute; make clean; make
		44	+ mkdir bin; cd multis_flute; ${MAKE} clean; ${MAKE}
		45	@echo "done"
		46
		47	flute_unittest ::
		48	@echo "------------------------"
		49	@echo "* FLUTE unit test *"
		50	@echo "------------------------"
		51	- mkdir bin; cd UnitTest; make clean; make
		52	+ mkdir bin; cd UnitTest; ${MAKE} clean; ${MAKE}
25	@echo "done"	53	@echo "done"
26		54
27	clean :	55	clean :
Lines 29-43 Link Here
29	@echo "* Cleaning ALC library *"	57	@echo "* Cleaning ALC library *"
30	@echo "----------------------------"	58	@echo "----------------------------"
31	- cd alclib; make clean	59	- cd alclib; make clean
32	+ cd alclib; gmake clean	60	+ cd alclib; ${MAKE} clean
33	@echo "----------------------------"	61	@echo "----------------------------"
34	@echo "* Cleaning SDP library *"	62	@echo "* Cleaning SDP library *"
35	@echo "----------------------------"	63	@echo "----------------------------"
36	- cd sdplib; make clean	64	- cd sdplib; make clean
37	+ cd sdplib; gmake clean	65	+ cd sdplib; ${MAKE} clean
		66	@echo "------------------------------"
		67	@echo "* Cleaning FLUTE library *"
		68	@echo "------------------------------"
		69	- cd flutelib; make clean
		70	+ cd flutelib; ${MAKE} clean
38	@echo "----------------------------------"	71	@echo "----------------------------------"
39	@echo "* Cleaning flute application *"	72	@echo "* Cleaning FLUTE application *"
40	@echo "----------------------------------"	73	@echo "----------------------------------"
41	- cd flute; make clean	74	- cd flute; make clean
42	+ cd flute; gmake clean	75	+ cd flute; ${MAKE} clean
		76	@echo "-------------------------------------------------------"
		77	@echo "* Cleaning example multisession FLUTE application *"
		78	@echo "-------------------------------------------------------"
		79	- cd multis_flute; make clean
		80	+ cd multis_flute; ${MAKE} clean
		81	@echo "--------------------------------"
		82	@echo "* Cleaning FLUTE unit test *"
		83	@echo "--------------------------------"
		84	- cd UnitTest; make clean
		85	+ cd UnitTest; ${MAKE} clean
43	@echo "done"	86	@echo "done"
		87




--- alclib/mad.h.orig	2007-01-31 13:43:17 UTC
+++ alclib/mad.h
@@ -35,7 +35,10 @@
 #define _MAD_H_
 
 #ifdef LINUX
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #endif
 
 #include "utils.h"




--- alclib/linux_ssm.h.orig	2007-02-26 13:48:19 UTC
+++ alclib/linux_ssm.h
@@ -54,12 +54,12 @@ extern "C" {
 
 struct ip_mreq_source {
   struct in_addr imr_multiaddr;  /**< IP address of group */
-  struct in_addr imr_interface;  /**< IP address of interface */
   struct in_addr imr_sourceaddr; /**< IP address of source */
+  struct in_addr imr_interface;  /**< IP address of interface */
 };
 
-#define IP_ADD_SOURCE_MEMBERSHIP        39

 
 #endif
 
@@ -84,8 +84,8 @@ struct group_source_req {
   struct sockaddr_storage gsr_source;	/**< source address */
 };
 
-#define MCAST_JOIN_SOURCE_GROUP		46
-#define MCAST_LEAVE_SOURCE_GROUP	47
+#define MCAST_JOIN_SOURCE_GROUP		74
+#define MCAST_LEAVE_SOURCE_GROUP	75
 
 #endif
 




--- sdplib/port_misc.c.orig
+++ sdplib/port_misc.c
@@ -47,6 +47,7 @@
 #  include <sys/unistd.h>
 #endif
 
+#define HAVE_UNISTD_H
 #if defined (HAVE_UNISTD_H)
 #  include <unistd.h>
 #endif
@@ -54,6 +55,10 @@
 #if defined (HAVE_SYSLOG_H)
 #  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>

Lines 8-13 Link Here

(-)net/mad_fcl/pkg-descr (-3 / +1 lines)
8	the ALC/LCT protocols. The MAD/TUT project is going on at Tampere	8	the ALC/LCT protocols. The MAD/TUT project is going on at Tampere
9	University of Technology (TUT).	9	University of Technology (TUT).
10		10
11	WWW: http://www.atm.tut.fi/mad/	11	WWW: http://mad.cs.tut.fi/
12
13	Janos Mohacsi <janos.mohacsi@bsd.hu>

Return to bug 205215

Lines 2-48 Link Here

(-)net/mad_fcl/Makefile (-26 / +43 lines)
2	# $FreeBSD: head/net/mad_fcl/Makefile 401096 2015-11-09 12:59:03Z antoine $	2	# $FreeBSD: head/net/mad_fcl/Makefile 401096 2015-11-09 12:59:03Z antoine $
3		3
4	PORTNAME= mad_fcl	4	PORTNAME= mad_fcl
5	PORTVERSION= 1.3	5	PORTVERSION= 1.7
6	PORTREVISION= 1
7	CATEGORIES= net ipv6	6	CATEGORIES= net ipv6
8	MASTER_SITES= http://www.atm.tut.fi/mad/download/	7	MASTER_SITES= http://mad.cs.tut.fi/download/
9	DISTNAME= ${PORTNAME}_v${PORTVERSION}_src	8	DISTNAME= ${PORTNAME}_v${PORTVERSION}_src
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
12	COMMENT= FLUTE - File Delivery over Unidirectional Transport implementation	11	COMMENT= FLUTE - File Delivery over Unidirectional Transport implementation
13		12
14	BROKEN= unfetchable	13	LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
		14	libexpat.so:${PORTSDIR}/textproc/expat2
15		15
16	LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2	16	USES= dos2unix gmake
17
18	USES= gmake
19	USE_OPENSSL= yes	17	USE_OPENSSL= yes
20		18	MAKE_ENV= LFLAGS="${LDFLAGS}"
21	DOC_FILES= fdt-example.xml flute-sdp-example.sdp
22
23	PORTDOCS= ${DOC_FILES} README.TXT
24	PLIST_FILES= bin/flute
25
26	MAKE_JOBS_UNSAFE= yes	19	MAKE_JOBS_UNSAFE= yes
27		20
28	OPTIONS_DEFINE= DOCS	21	CFLAGS+= -DHAVE_SYS_TYPES_H -DHAVE_SYS_SELECT_H -DHAVE_UNISTD_H \
		22	-I${LOCALBASE}/include
		23	LDFLAGS+= -L${LOCALBASE}/lib -pthread
		24
		25	PORTDOCS= README.TXT
		26	PORTEXAMPLES= fdt-example.xml flute-sdp-example.sdp
		27	PLIST_FILES= bin/flute bin/multis_flute
29		28
30	pre-patch:	29	OPTIONS_DEFINE= DOCS EXAMPLES
31	# Fixing the end-of-lines:
32	@for f in `${FIND} ${WRKSRC}/.. -type f` ; do \
33	${TR} -d '\015' < $$f > $$f.noms && \
34	${CAT} $$f.noms > $$f && ${RM} $$f.noms; done
35		30
36	post-patch:	31	post-patch:
37	@${FIND} ${WRKSRC} -name Makefile \| ${XARGS} \	32	@${FIND} ${WRKSRC} -name "Makefile" \| ${XARGS} ${REINPLACE_CMD} -e \
38	${REINPLACE_CMD} -e 's\|gcc\|${CC}\|'	33	'/CC/s\| =\| ?=\| ; \
		34	s\|-O3 -g\|\| ; \
		35	s\|-D_ISOC99_SOURCE\|\| ; \
		36	s\|-D_XOPEN_SOURCE=500\|\| ; \
		37	s\|/usr/local/ssl\|${OPENSSLBASE}\| ; \
		38	s\|-I/usr/local/include/boost-1_33_1\|\| ; \
		39	s\|-L/usr/local/lib\|\| ; \
		40	s\|-lpthread\|-lcompat\|'
		41	@${FIND} ${WRKSRC} -name "*.[ch]" \| ${XARGS} ${REINPLACE_CMD} -e \
		42	's\|fopen64\|fopen\| ; \
		43	s\|ftruncate64\|ftruncate\| ; \
		44	s\|lseek64\|lseek\| ; \
		45	s\|off64_t\|off_t\| ; \
		46	s\|open64\|open\| ; \
		47	s\|stat64\|stat\|'
		48	@${REINPLACE_CMD} -e \
		49	'/<curl\/types.h>/d' ${WRKSRC}/flutelib/http_file_repair.h
39		50
40	do-install:	51	do-install:
41	${INSTALL_PROGRAM} ${WRKSRC}/bin/flute ${STAGEDIR}${PREFIX}/bin	52	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} flute multis_flute \
		53	${STAGEDIR}${PREFIX}/bin)
		54
		55	post-install-DOCS-on:
42	@${MKDIR} ${STAGEDIR}${DOCSDIR}	56	@${MKDIR} ${STAGEDIR}${DOCSDIR}
43	.for file in ${DOC_FILES}	57	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \
44	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR}	58	${STAGEDIR}${DOCSDIR})
45	.endfor	59
46	${INSTALL_DATA} ${WRKSRC}/README.TXT ${STAGEDIR}${DOCSDIR}	60	post-install-EXAMPLES-on:
		61	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
		62	(cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTEXAMPLES} \
		63	${STAGEDIR}${EXAMPLESDIR})
47		64
48	.include <bsd.port.mk>	65	.include <bsd.port.mk>

Line 0 Link Here

(-)net/mad_fcl/files/patch-alclib__mad.h (+13 lines)
	1	--- alclib/mad.h.orig 2007-01-31 13:43:17 UTC
	2	+++ alclib/mad.h
	3	@@ -35,7 +35,10 @@
	4	#define _MAD_H_
	5
	6	#ifdef LINUX
	7	+#include <sys/types.h>
	8	+#include <sys/socket.h>
	9	#include <netinet/in.h>
	10	+#include <arpa/inet.h>
	11	#endif
	12
	13	#include "utils.h"

Lines 1-12 Link Here

(-)net/mad_fcl/files/patch-alclib_linux__ssm.h (-15 / +15 lines)
1	--- alclib/linux_ssm.h.orig Fri Jul 30 14:15:54 2004	1	--- alclib/linux_ssm.h.orig 2007-02-26 13:48:19 UTC
2	+++ alclib/linux_ssm.h Mon Aug 2 11:50:48 2004	2	+++ alclib/linux_ssm.h
3	@@ -33,12 +33,12 @@	3	@@ -54,12 +54,12 @@ extern "C" {
4		4
5	struct ip_mreq_source {	5	struct ip_mreq_source {
6	struct in_addr imr_multiaddr; /* IP address of group */	6	struct in_addr imr_multiaddr; /*< IP address of group /
7	- struct in_addr imr_interface; /* IP address of interface */	7	- struct in_addr imr_interface; /*< IP address of interface /
8	struct in_addr imr_sourceaddr; /* IP address of source */	8	struct in_addr imr_sourceaddr; /*< IP address of source /
9	+ struct in_addr imr_interface; /* IP address of interface */	9	+ struct in_addr imr_interface; /*< IP address of interface /
10	};	10	};
11		11
12	-#define IP_ADD_SOURCE_MEMBERSHIP 39	12	-#define IP_ADD_SOURCE_MEMBERSHIP 39
Lines 16-29 Link Here
16		16
17	#endif	17	#endif
18		18
19	@@ -54,8 +54,8 @@	19	@@ -84,8 +84,8 @@ struct group_source_req {
20	struct sockaddr_storage gsr_source; /* source address */	20	struct sockaddr_storage gsr_source; /*< source address /
21	};	21	};
22		22
23	-#define MCAST_JOIN_SOURCE_GROUP 46	23	-#define MCAST_JOIN_SOURCE_GROUP 46
24	-#define MCAST_LEAVE_SOURCE_GROUP 47	24	-#define MCAST_LEAVE_SOURCE_GROUP 47
25	+#define MCAST_JOIN_SOURCE_GROUP 74	25	+#define MCAST_JOIN_SOURCE_GROUP 74
26	+#define MCAST_LEAVE_SOURCE_GROUP 75	26	+#define MCAST_LEAVE_SOURCE_GROUP 75
27		27
28	#endif	28	#endif
29		29

Lines 1-21 Link Here

(-)net/mad_fcl/files/patch-sdplib_port__misc.c (-21 lines)
1	--- sdplib/port_misc.c.orig
2	+++ sdplib/port_misc.c
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	@@ -54,6 +55,10 @@
12	#if defined (HAVE_SYSLOG_H)
13	# include <syslog.h>
14	#endif
15	+
16	+#include <sys/types.h>
17	+#include <sys/time.h>
18	+#define HAVE_SYS_SELECT_H
19
20	#if defined (HAVE_SYS_SELECT_H)
21	# include <sys/select.h>