diff -ruN multicat.orig/Makefile multicat/Makefile --- multicat.orig/Makefile 2020-01-06 04:10:13.000000000 +0100 +++ multicat/Makefile 2020-05-02 09:05:05.711146000 +0200 @@ -2,11 +2,11 @@ # $FreeBSD: head/net/multicat/Makefile 522190 2020-01-06 03:10:13Z yuri $ PORTNAME= multicat -PORTVERSION= 2.2 +PORTVERSION= 2.3 CATEGORIES= net multimedia MASTER_SITES= https://get.videolan.org/multicat/${PORTVERSION}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= m.muenz@gmail.com COMMENT= Simple and efficient multicast and transport stream manipulation LICENSE= GPLv2+ diff -ruN multicat.orig/distinfo multicat/distinfo --- multicat.orig/distinfo 2017-02-06 18:47:06.000000000 +0100 +++ multicat/distinfo 2020-05-02 08:51:08.591197000 +0200 @@ -1,3 +1,3 @@ -TIMESTAMP = 1486402678 -SHA256 (multicat-2.2.tar.bz2) = fa4e48b38665658df7719293f9358df08f59f3eb7f7b77df510b35951e316b40 -SIZE (multicat-2.2.tar.bz2) = 35369 +TIMESTAMP = 1573810897 +SHA256 (multicat-2.3.tar.bz2) = 2be162e9e8b2e6f6aa7686431f102db6c72c8288bd82dbc67ffed631f4a3361e +SIZE (multicat-2.3.tar.bz2) = 37307 diff -ruN multicat.orig/files/patch-Makefile multicat/files/patch-Makefile --- multicat.orig/files/patch-Makefile 2017-02-06 18:47:06.000000000 +0100 +++ multicat/files/patch-Makefile 2020-05-02 08:51:08.591537000 +0200 @@ -1,11 +1,12 @@ ---- Makefile.orig 2017-01-31 18:17:02 UTC +--- Makefile.orig 2018-06-12 15:18:47 UTC +++ Makefile @@ -1,8 +1,7 @@ # multicat Makefile - VERSION = 2.2 --CFLAGS += -Wall -Wformat-security -O3 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -D_ISOC99_SOURCE -D_BSD_SOURCE +-VERSION = 2.2 +-CFLAGS += -Wall -Wformat-security -O3 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -D_ISOC99_SOURCE -D_BSD_SOURCE -D_DEFAULT_SOURCE -CFLAGS += -g ++VERSION = 2.3 +CFLAGS += -Wall -Wformat-security -D_FILE_OFFSET_BITS=64 -D_ISOC99_SOURCE -D_BSD_SOURCE # Comment out the following line for Mac OS X build LDLIBS += -lrt -pthread diff -ruN multicat.orig/files/patch-multicat.c multicat/files/patch-multicat.c --- multicat.orig/files/patch-multicat.c 2017-01-13 10:22:25.000000000 +0100 +++ multicat/files/patch-multicat.c 2020-05-02 08:51:08.591681000 +0200 @@ -1,15 +1,6 @@ ---- multicat.c.orig 2016-10-07 14:32:44 UTC +--- multicat.c.orig 2019-11-15 11:52:01 UTC +++ multicat.c -@@ -44,7 +44,7 @@ - #include - #include - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__DragonFly__) - # include - #endif - -@@ -280,14 +280,14 @@ static ssize_t raw_Write( const void *p_ +@@ -280,14 +280,14 @@ static ssize_t raw_Write( const void *p_buf, size_t i_ ssize_t i_ret; struct iovec iov[2]; diff -ruN multicat.orig/files/patch-util.c multicat/files/patch-util.c --- multicat.orig/files/patch-util.c 2017-01-13 10:22:25.000000000 +0100 +++ multicat/files/patch-util.c 2020-05-02 08:51:08.591899000 +0200 @@ -1,6 +1,6 @@ ---- util.c.orig 2016-10-07 14:32:44 UTC +--- util.c.orig 2019-11-15 11:52:26 UTC +++ util.c -@@ -285,7 +285,7 @@ static int GetInterfaceIndex( const char +@@ -285,7 +285,7 @@ static int GetInterfaceIndex( const char *psz_name ) close( i_fd ); @@ -9,7 +9,7 @@ return ifr.ifr_index; #else return ifr.ifr_ifindex; -@@ -451,7 +451,7 @@ static void RawFillHeaders(struct udpraw +@@ -454,7 +454,7 @@ static void RawFillHeaders(struct udprawpkt *dgram, uint8_t ttl, uint8_t tos, uint16_t len) { #ifndef __APPLE__ @@ -18,7 +18,7 @@ struct ip *iph = &(dgram->iph); #else struct iphdr *iph = &(dgram->iph); -@@ -468,7 +468,7 @@ static void RawFillHeaders(struct udpraw +@@ -471,7 +471,7 @@ static void RawFillHeaders(struct udprawpkt *dgram, printf("Filling raw header (%p) (%s:%u -> %s:%u)\n", dgram, ipsrc_str, portsrc, ipdst_str, portdst); #endif @@ -27,7 +27,16 @@ // Fill ip header iph->ip_hl = 5; // ip header with no specific option iph->ip_v = 4; -@@ -710,7 +710,7 @@ int OpenSocket( const char *_psz_arg, in +@@ -558,7 +558,7 @@ int OpenSocket( const char *_psz_arg, int i_ttl, uint1 + in_addr_t i_raw_srcaddr = INADDR_ANY; + int i_raw_srcport = 0; + char *psz_ifname = NULL; +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__DragonFly__) + int hincl = 1; + #endif + +@@ -718,7 +718,7 @@ int OpenSocket( const char *_psz_arg, int i_ttl, uint1 i_raw_srcaddr, connect_addr.sin.sin_addr.s_addr, i_raw_srcport, ntohs(connect_addr.sin.sin_port), i_ttl, i_tos, 0); i_fd = socket( AF_INET, SOCK_RAW, IPPROTO_RAW ); @@ -36,7 +45,7 @@ if ( setsockopt( i_fd, IPPROTO_IP, IP_HDRINCL, &hincl, sizeof(hincl)) == -1 ) { msg_Err( NULL, "unable to set socket (%s)", strerror(errno) ); -@@ -747,7 +747,7 @@ int OpenSocket( const char *_psz_arg, in +@@ -755,7 +755,7 @@ int OpenSocket( const char *_psz_arg, int i_ttl, uint1 if ( bind_addr.ss.ss_family != AF_UNSPEC ) { @@ -45,7 +54,7 @@ if ( IN6_IS_ADDR_MULTICAST( &bind_addr.sin6.sin6_addr ) ) { struct ipv6_mreq imr; -@@ -827,7 +827,7 @@ normal_bind: +@@ -838,7 +838,7 @@ normal_bind: } else #endif diff -ruN multicat.orig/files/patch-util.h multicat/files/patch-util.h --- multicat.orig/files/patch-util.h 2017-01-13 10:22:25.000000000 +0100 +++ multicat/files/patch-util.h 2020-05-02 08:51:08.592118000 +0200 @@ -1,20 +1,20 @@ ---- util.h.orig 2016-10-07 14:32:44 UTC +--- util.h.orig 2019-11-15 11:52:14 UTC +++ util.h -@@ -24,7 +24,7 @@ - #include +@@ -25,7 +25,7 @@ #include + #include -#if defined(__APPLE__) || defined(__FreeBSD__) +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) #define POLLRDHUP 0 /* uClibc may does not have clock_nanosleep() */ #elif !defined (__UCLIBC__) || \ -@@ -59,7 +59,7 @@ typedef union +@@ -60,7 +60,7 @@ typedef union + * Raw udp packet structure with flexible-array payload *****************************************************************************/ struct udprawpkt { - #if !defined(__APPLE__) --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) +-#if defined(__APPLE__) || defined(__FreeBSD__) ++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) struct ip iph; #else struct iphdr iph; diff -ruN multicat.orig/patch multicat/patch --- multicat.orig/patch 1970-01-01 01:00:00.000000000 +0100 +++ multicat/patch 2020-05-02 08:50:52.789739000 +0200 @@ -0,0 +1,159 @@ +diff -Naur multicat/Makefile multicat23/Makefile +--- multicat/Makefile 2019-07-29 20:41:44.000000000 +0200 ++++ multicat23/Makefile 2019-11-15 10:41:34.569120000 +0100 +@@ -2,7 +2,7 @@ + # $FreeBSD: head/net/multicat/Makefile 507585 2019-07-29 18:41:44Z amdmi3 $ + + PORTNAME= multicat +-PORTVERSION= 2.2 ++PORTVERSION= 2.3 + CATEGORIES= net multimedia + MASTER_SITES= https://get.videolan.org/multicat/${PORTVERSION}/ + +diff -Naur multicat/distinfo multicat23/distinfo +--- multicat/distinfo 2017-02-06 18:47:06.000000000 +0100 ++++ multicat23/distinfo 2019-11-15 10:41:37.416882000 +0100 +@@ -1,3 +1,3 @@ +-TIMESTAMP = 1486402678 +-SHA256 (multicat-2.2.tar.bz2) = fa4e48b38665658df7719293f9358df08f59f3eb7f7b77df510b35951e316b40 +-SIZE (multicat-2.2.tar.bz2) = 35369 ++TIMESTAMP = 1573810897 ++SHA256 (multicat-2.3.tar.bz2) = 2be162e9e8b2e6f6aa7686431f102db6c72c8288bd82dbc67ffed631f4a3361e ++SIZE (multicat-2.3.tar.bz2) = 37307 +diff -Naur multicat/files/patch-Makefile multicat23/files/patch-Makefile +--- multicat/files/patch-Makefile 2017-02-06 18:47:06.000000000 +0100 ++++ multicat23/files/patch-Makefile 2019-11-15 13:00:18.165147000 +0100 +@@ -1,11 +1,12 @@ +---- Makefile.orig 2017-01-31 18:17:02 UTC ++--- Makefile.orig 2018-06-12 15:18:47 UTC + +++ Makefile + @@ -1,8 +1,7 @@ + # multicat Makefile + +- VERSION = 2.2 +--CFLAGS += -Wall -Wformat-security -O3 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -D_ISOC99_SOURCE -D_BSD_SOURCE ++-VERSION = 2.2 ++-CFLAGS += -Wall -Wformat-security -O3 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -D_ISOC99_SOURCE -D_BSD_SOURCE -D_DEFAULT_SOURCE + -CFLAGS += -g +++VERSION = 2.3 + +CFLAGS += -Wall -Wformat-security -D_FILE_OFFSET_BITS=64 -D_ISOC99_SOURCE -D_BSD_SOURCE + # Comment out the following line for Mac OS X build + LDLIBS += -lrt -pthread +diff -Naur multicat/files/patch-multicat.c multicat23/files/patch-multicat.c +--- multicat/files/patch-multicat.c 2017-01-13 10:22:25.000000000 +0100 ++++ multicat23/files/patch-multicat.c 2019-11-15 13:00:18.166354000 +0100 +@@ -1,15 +1,6 @@ +---- multicat.c.orig 2016-10-07 14:32:44 UTC ++--- multicat.c.orig 2019-11-15 11:52:01 UTC + +++ multicat.c +-@@ -44,7 +44,7 @@ +- #include +- #include +- +--#ifdef __FreeBSD__ +-+#if defined(__FreeBSD__) || defined(__DragonFly__) +- # include +- #endif +- +-@@ -280,14 +280,14 @@ static ssize_t raw_Write( const void *p_ ++@@ -280,14 +280,14 @@ static ssize_t raw_Write( const void *p_buf, size_t i_ + ssize_t i_ret; + struct iovec iov[2]; + +diff -Naur multicat/files/patch-util.c multicat23/files/patch-util.c +--- multicat/files/patch-util.c 2017-01-13 10:22:25.000000000 +0100 ++++ multicat23/files/patch-util.c 2019-11-15 13:00:18.167562000 +0100 +@@ -1,6 +1,6 @@ +---- util.c.orig 2016-10-07 14:32:44 UTC ++--- util.c.orig 2019-11-15 11:52:26 UTC + +++ util.c +-@@ -285,7 +285,7 @@ static int GetInterfaceIndex( const char ++@@ -285,7 +285,7 @@ static int GetInterfaceIndex( const char *psz_name ) + + close( i_fd ); + +@@ -9,7 +9,7 @@ + return ifr.ifr_index; + #else + return ifr.ifr_ifindex; +-@@ -451,7 +451,7 @@ static void RawFillHeaders(struct udpraw ++@@ -454,7 +454,7 @@ static void RawFillHeaders(struct udprawpkt *dgram, + uint8_t ttl, uint8_t tos, uint16_t len) + { + #ifndef __APPLE__ +@@ -18,7 +18,7 @@ + struct ip *iph = &(dgram->iph); + #else + struct iphdr *iph = &(dgram->iph); +-@@ -468,7 +468,7 @@ static void RawFillHeaders(struct udpraw ++@@ -471,7 +471,7 @@ static void RawFillHeaders(struct udprawpkt *dgram, + printf("Filling raw header (%p) (%s:%u -> %s:%u)\n", dgram, ipsrc_str, portsrc, ipdst_str, portdst); + #endif + +@@ -27,7 +27,16 @@ + // Fill ip header + iph->ip_hl = 5; // ip header with no specific option + iph->ip_v = 4; +-@@ -710,7 +710,7 @@ int OpenSocket( const char *_psz_arg, in ++@@ -558,7 +558,7 @@ int OpenSocket( const char *_psz_arg, int i_ttl, uint1 ++ in_addr_t i_raw_srcaddr = INADDR_ANY; ++ int i_raw_srcport = 0; ++ char *psz_ifname = NULL; ++-#ifdef __FreeBSD__ +++#if defined(__FreeBSD__) || defined(__DragonFly__) ++ int hincl = 1; ++ #endif ++ ++@@ -718,7 +718,7 @@ int OpenSocket( const char *_psz_arg, int i_ttl, uint1 + i_raw_srcaddr, connect_addr.sin.sin_addr.s_addr, i_raw_srcport, + ntohs(connect_addr.sin.sin_port), i_ttl, i_tos, 0); + i_fd = socket( AF_INET, SOCK_RAW, IPPROTO_RAW ); +@@ -36,7 +45,7 @@ + if ( setsockopt( i_fd, IPPROTO_IP, IP_HDRINCL, &hincl, sizeof(hincl)) == -1 ) + { + msg_Err( NULL, "unable to set socket (%s)", strerror(errno) ); +-@@ -747,7 +747,7 @@ int OpenSocket( const char *_psz_arg, in ++@@ -755,7 +755,7 @@ int OpenSocket( const char *_psz_arg, int i_ttl, uint1 + + if ( bind_addr.ss.ss_family != AF_UNSPEC ) + { +@@ -45,7 +54,7 @@ + if ( IN6_IS_ADDR_MULTICAST( &bind_addr.sin6.sin6_addr ) ) + { + struct ipv6_mreq imr; +-@@ -827,7 +827,7 @@ normal_bind: ++@@ -838,7 +838,7 @@ normal_bind: + } + else + #endif +diff -Naur multicat/files/patch-util.h multicat23/files/patch-util.h +--- multicat/files/patch-util.h 2017-01-13 10:22:25.000000000 +0100 ++++ multicat23/files/patch-util.h 2019-11-15 13:00:18.168761000 +0100 +@@ -1,20 +1,20 @@ +---- util.h.orig 2016-10-07 14:32:44 UTC ++--- util.h.orig 2019-11-15 11:52:14 UTC + +++ util.h +-@@ -24,7 +24,7 @@ +- #include ++@@ -25,7 +25,7 @@ + #include ++ #include + + -#if defined(__APPLE__) || defined(__FreeBSD__) + +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) + #define POLLRDHUP 0 + /* uClibc may does not have clock_nanosleep() */ + #elif !defined (__UCLIBC__) || \ +-@@ -59,7 +59,7 @@ typedef union ++@@ -60,7 +60,7 @@ typedef union ++ * Raw udp packet structure with flexible-array payload + *****************************************************************************/ + struct udprawpkt { +- #if !defined(__APPLE__) +--#if defined(__FreeBSD__) +-+#if defined(__FreeBSD__) || defined(__DragonFly__) ++-#if defined(__APPLE__) || defined(__FreeBSD__) +++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) + struct ip iph; + #else + struct iphdr iph;