Update net/multicat to version 2.2
authorDPorts Builder <nobody@home.ok>
Tue, 21 Feb 2017 15:22:35 +0000 (07:22 -0800)
committerDPorts Builder <nobody@home.ok>
Tue, 21 Feb 2017 15:22:35 +0000 (07:22 -0800)
net/multicat/Makefile
net/multicat/distinfo
net/multicat/dragonfly/patch-util.c [new file with mode: 0644]
net/multicat/files/patch-Makefile [new file with mode: 0644]

index ae7b986..339ee37 100644 (file)
@@ -2,8 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=      multicat
-PORTVERSION=   git20161007
+PORTVERSION=   2.2
 CATEGORIES=    net multimedia
+MASTER_SITES=  https://get.videolan.org/multicat/${PORTVERSION}/
 
 MAINTAINER=    amdmi3@FreeBSD.org
 COMMENT=       Simple and efficient multicast and transport stream manipulation
@@ -13,11 +14,7 @@ LICENSE_FILE=        ${WRKSRC}/COPYING
 
 BUILD_DEPENDS= ${LOCALBASE}/include/bitstream/mpeg/ts.h:multimedia/bitstream
 
-USE_GITHUB=    yes # XXX: FreeBSD fixes not upstreamed yet
-GH_ACCOUNT=    AMDmi3
-GH_TAGNAME=    b551ed4
-
-USES=          localbase
+USES=          localbase tar:bzip2
 ALL_TARGET=    ${PORTNAME}
 
 PORTDOCS=      AUTHORS Changelog NEWS README
index 94974f9..f576f4c 100644 (file)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475850828
-SHA256 (AMDmi3-multicat-git20161007-b551ed4_GH0.tar.gz) = 41a501a654490f6ec3c860ef28d882196bacf485fe04a4da162605c9329e41b3
-SIZE (AMDmi3-multicat-git20161007-b551ed4_GH0.tar.gz) = 42902
+TIMESTAMP = 1486402678
+SHA256 (multicat-2.2.tar.bz2) = fa4e48b38665658df7719293f9358df08f59f3eb7f7b77df510b35951e316b40
+SIZE (multicat-2.2.tar.bz2) = 35369
diff --git a/net/multicat/dragonfly/patch-util.c b/net/multicat/dragonfly/patch-util.c
new file mode 100644 (file)
index 0000000..7455006
--- /dev/null
@@ -0,0 +1,12 @@
+Missing patch bit.
+--- util.c.intermediate        2017-02-21 15:55:42 UTC
++++ util.c
+@@ -555,7 +555,7 @@ int OpenSocket( const char *_psz_arg, in
+     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
diff --git a/net/multicat/files/patch-Makefile b/net/multicat/files/patch-Makefile
new file mode 100644 (file)
index 0000000..b3416af
--- /dev/null
@@ -0,0 +1,12 @@
+--- Makefile.orig      2017-01-31 18:17:02 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
+-CFLAGS += -g
++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