Attachment 164071 Details for Bug 205215 – net_mad_fcl.diff

[patch] net_mad_fcl.diff

net_mad_fcl.diff (text/plain), 10.05 KB, created by tkato432 on 2015-12-10 18:39:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-12-10 18:39:07 UTC

Size: 10.05 KB

patch

obsolete

>diff -urN /usr/ports/net/mad_fcl/Makefile net/mad_fcl/Makefile
>--- /usr/ports/net/mad_fcl/Makefile	2015-11-09 22:25:41.158825000 +0900
>+++ net/mad_fcl/Makefile	2015-12-11 00:00:00.000000000 +0900
>@@ -2,47 +2,64 @@
> # $FreeBSD: head/net/mad_fcl/Makefile 401096 2015-11-09 12:59:03Z antoine $
> 
> PORTNAME=	mad_fcl
>-PORTVERSION=	1.3
>-PORTREVISION=	1
>+PORTVERSION=	1.7
> CATEGORIES=	net ipv6
>-MASTER_SITES=	http://www.atm.tut.fi/mad/download/
>+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
> 
>-BROKEN=		unfetchable
>+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
>+		libexpat.so:${PORTSDIR}/textproc/expat2
> 
>-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
>-
>-USES=		gmake
>+USES=		dos2unix gmake
> USE_OPENSSL=	yes
>-
>-DOC_FILES=	fdt-example.xml flute-sdp-example.sdp
>-
>-PORTDOCS=	${DOC_FILES} README.TXT
>-PLIST_FILES=	bin/flute
>-
>+MAKE_ENV=	LFLAGS="${LDFLAGS}"
> MAKE_JOBS_UNSAFE= yes
> 
>-OPTIONS_DEFINE=	DOCS
>+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
> 
>-pre-patch:
>-	# 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
>+OPTIONS_DEFINE=	DOCS EXAMPLES
> 
> post-patch:
>-	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
>-		${REINPLACE_CMD} -e 's|gcc|${CC}|'
>+	@${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:
>-	${INSTALL_PROGRAM} ${WRKSRC}/bin/flute ${STAGEDIR}${PREFIX}/bin
>+	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} flute multis_flute \
>+		${STAGEDIR}${PREFIX}/bin)
>+
>+post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-.for file in ${DOC_FILES}
>-	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR}
>-.endfor
>-	${INSTALL_DATA} ${WRKSRC}/README.TXT ${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>
>diff -urN /usr/ports/net/mad_fcl/distinfo net/mad_fcl/distinfo
>--- /usr/ports/net/mad_fcl/distinfo	2015-08-24 03:57:13.694240000 +0900
>+++ net/mad_fcl/distinfo	2015-12-11 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (mad_fcl_v1.3_src.tar.gz) = 2b41e06128a14ac42aeb58633562b43cb5d0499e2852b91d810f53dbd7e9ba29
>-SIZE (mad_fcl_v1.3_src.tar.gz) = 129137
>+SHA256 (mad_fcl_v1.7_src.tar.gz) = 97c0abc3807e48b102fee85bf14aaaeabe39ce3f98bb4423daed9651978e62f0
>+SIZE (mad_fcl_v1.7_src.tar.gz) = 208408
>diff -urN /usr/ports/net/mad_fcl/files/patch-Makefile net/mad_fcl/files/patch-Makefile
>--- /usr/ports/net/mad_fcl/files/patch-Makefile	2015-08-24 03:57:13.728992000 +0900
>+++ net/mad_fcl/files/patch-Makefile	2015-12-11 00:00:00.000000000 +0900
>@@ -1,11 +1,15 @@
>---- Makefile.orig
>+--- Makefile.orig	2007-01-31 10:09:11 UTC
> +++ Makefile
>-@@ -4,34 +4,34 @@
>+@@ -1,71 +1,71 @@
>+-all :	alclib sdplib flutelib flute multis_flute flute_unittest
>++all :	alclib sdplib flutelib flute multis_flute
>+ 
>+ alclib ::
>  	@echo "-------------------"
>  	@echo "*** ALC library ***"
>  	@echo "-------------------"
> -	mkdir lib; cd alclib; make clean; make                   
>-+	mkdir lib; cd alclib; gmake clean; gmake                   
>++	mkdir lib; cd alclib; ${MAKE} clean; ${MAKE}                   
>  	@echo "done"
>  
>  sdplib ::
>@@ -13,15 +17,39 @@
>  	@echo "*** SDP library ***"
>  	@echo "-------------------"
> -	mkdir lib; cd sdplib; make clean; make                   
>-+	mkdir lib; cd sdplib; gmake clean; gmake                   
>++	mkdir lib; cd sdplib; ${MAKE} clean; ${MAKE}                   
>+ 	@echo "done"
>+ 
>+ flutelib ::
>+ 	@echo "---------------------"
>+ 	@echo "*** FLUTE library ***"
>+ 	@echo "---------------------"
>+-	mkdir lib; cd flutelib; make clean; make
>++	mkdir lib; cd flutelib; ${MAKE} clean; ${MAKE}
>  	@echo "done"
>  
>  flute ::
>  	@echo "-------------------------"
>- 	@echo "*** flute application ***"
>+ 	@echo "*** FLUTE application ***"
>  	@echo "-------------------------"
> -	mkdir bin; cd flute; make clean; make
>-+	mkdir bin; cd flute; gmake clean; gmake
>++	mkdir bin; cd flute; ${MAKE} clean; ${MAKE}
>+ 	@echo "done"
>+ 
>+ multis_flute ::
>+ 	@echo "----------------------------------------------"
>+ 	@echo "*** Example multisession FLUTE application ***"
>+ 	@echo "----------------------------------------------"
>+-	mkdir bin; cd multis_flute; make clean; make
>++	mkdir bin; cd multis_flute; ${MAKE} clean; ${MAKE}
>+ 	@echo "done"
>+ 
>+ flute_unittest ::
>+ 	@echo "------------------------"
>+ 	@echo "*** FLUTE unit test ***"
>+ 	@echo "------------------------"
>+-	mkdir bin; cd UnitTest; make clean; make
>++	mkdir bin; cd UnitTest; ${MAKE} clean; ${MAKE}
>  	@echo "done"
>  
>  clean :
>@@ -29,15 +57,31 @@
>  	@echo "*** Cleaning ALC library ***"
>  	@echo "----------------------------"
> -	cd alclib; make clean
>-+	cd alclib; gmake clean
>++	cd alclib; ${MAKE} clean
>  	@echo "----------------------------"
>  	@echo "*** Cleaning SDP library ***"
>  	@echo "----------------------------"
> -	cd sdplib; make clean
>-+	cd sdplib; gmake clean
>++	cd sdplib; ${MAKE} clean
>+ 	@echo "------------------------------"
>+ 	@echo "*** Cleaning FLUTE library ***"
>+ 	@echo "------------------------------"
>+-	cd flutelib; make clean
>++	cd flutelib; ${MAKE} clean
>  	@echo "----------------------------------"
>- 	@echo "*** Cleaning flute application ***"
>+ 	@echo "*** Cleaning FLUTE application ***"
>  	@echo "----------------------------------"
> -	cd flute; make clean
>-+	cd flute; gmake clean
>++	cd flute; ${MAKE} clean
>+ 	@echo "-------------------------------------------------------"
>+ 	@echo "*** Cleaning example multisession FLUTE application ***"
>+ 	@echo "-------------------------------------------------------"
>+-	cd multis_flute; make clean
>++	cd multis_flute; ${MAKE} clean
>+ 	@echo "--------------------------------"
>+ 	@echo "*** Cleaning FLUTE unit test ***"
>+ 	@echo "--------------------------------"
>+-	cd UnitTest; make clean
>++	cd UnitTest; ${MAKE} clean
>  	@echo "done"
>+ 
>diff -urN /usr/ports/net/mad_fcl/files/patch-alclib__mad.h net/mad_fcl/files/patch-alclib__mad.h
>--- /usr/ports/net/mad_fcl/files/patch-alclib__mad.h	1970-01-01 09:00:00.000000000 +0900
>+++ net/mad_fcl/files/patch-alclib__mad.h	2015-12-11 00:00:00.000000000 +0900
>@@ -0,0 +1,13 @@
>+--- 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"
>diff -urN /usr/ports/net/mad_fcl/files/patch-alclib_linux__ssm.h net/mad_fcl/files/patch-alclib_linux__ssm.h
>--- /usr/ports/net/mad_fcl/files/patch-alclib_linux__ssm.h	2015-08-24 03:57:13.740641000 +0900
>+++ net/mad_fcl/files/patch-alclib_linux__ssm.h	2015-12-11 00:00:00.000000000 +0900
>@@ -1,12 +1,12 @@
>---- alclib/linux_ssm.h.orig	Fri Jul 30 14:15:54 2004
>-+++ alclib/linux_ssm.h	Mon Aug  2 11:50:48 2004
>-@@ -33,12 +33,12 @@
>+--- 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 */
>+   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
>@@ -16,14 +16,14 @@
>  
>  #endif
>  
>-@@ -54,8 +54,8 @@
>-       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
>+@@ -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
>  
>diff -urN /usr/ports/net/mad_fcl/files/patch-sdplib_port__misc.c net/mad_fcl/files/patch-sdplib_port__misc.c
>--- /usr/ports/net/mad_fcl/files/patch-sdplib_port__misc.c	2015-08-24 03:57:13.759848000 +0900
>+++ net/mad_fcl/files/patch-sdplib_port__misc.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,21 +0,0 @@
>---- 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>
>diff -urN /usr/ports/net/mad_fcl/pkg-descr net/mad_fcl/pkg-descr
>--- /usr/ports/net/mad_fcl/pkg-descr	2015-08-24 03:57:13.710214000 +0900
>+++ net/mad_fcl/pkg-descr	2015-12-11 00:00:00.000000000 +0900
>@@ -8,6 +8,4 @@
> the ALC/LCT protocols. The MAD/TUT project is going on at Tampere
> University of Technology (TUT).
> 
>-WWW: http://www.atm.tut.fi/mad/
>-
>-Janos Mohacsi <janos.mohacsi@bsd.hu>
>+WWW: http://mad.cs.tut.fi/

Actions: View | Diff

Attachments on bug 205215: 164071