Attachment #196681 for bug #230814




PORTNAME=	icecast
DISTVERSIONPREFIX=	icecast-
DISTVERSION=	${ICVERSION}-kh${KH}
PORTREVISION=	4
CATEGORIES=	audio net ipv6
PKGNAMESUFFIX=	-kh


COMMENT=	Streaming mp3/ogg-vorbis audio server, KH branch

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libogg.so:audio/libogg \
		libtheora.so:multimedia/libtheora \

		libxml2.so:textproc/libxml2 \
		libxslt.so:textproc/libxslt

USE_GITHUB=	yes
GH_ACCOUNT=	karlheyes
GH_PROJECT=	icecast-kh

USES=		gmake pkgconfig ssl
GNU_CONFIGURE=	yes
USE_RC_SUBR=	${PORTNAME}

CFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

USE_GITHUB=	yes
GH_ACCOUNT=	karlheyes
GH_PROJECT=	icecast-kh

ICVERSION=	2.4.0
KH=		10

OPTIONS_DEFINE=		CURL DOCS KATE SPEEX

KATE_DESC=		Support Kate/Skeleton codec within Ogg streams
SPEEX_DESC=		Support Speex codec within Ogg streams

CURL_BUILD_DEPENDS=	curl>=7.10:ftp/curl
CURL_CONFIGURE_WITH=	curl=${LOCALBASE}
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl

KATE_CONFIGURE_WITH=	kate
KATE_LIB_DEPENDS=	libkate.so:multimedia/libkate

SPEEX_BUILD_DEPENDS=	speex>=1:audio/speex
SPEEX_CONFIGURE_WITH=	speex=${LOCALBASE}
SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
.else
CONFIGURE_ARGS+=	--without-curl
.endif

CONFLICTS_INSTALL=	icecast-[0-9]* icecast2-[0-9]*
LIB_DEPENDS+=	libkate.so:multimedia/libkate
.else
CONFIGURE_ARGS+=	--without-kate
.endif

.include <bsd.port.options.mk>
BUILD_DEPENDS+=	speex>=1:audio/speex
CONFIGURE_ARGS+=	--with-speex=${LOCALBASE}
.else
CONFIGURE_ARGS+=	--without-speex
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (karlheyes-icecast-kh-icecast-2.3.3-kh10_GH0.tar.gz) = c5d6e2fefe27ccc819e460bb27c67c876d66ed7ae89b094674d9e4e9857d74e4	1	TIMESTAMP = 1535557669
2	SIZE (karlheyes-icecast-kh-icecast-2.3.3-kh10_GH0.tar.gz) = 922537	2	SHA256 (karlheyes-icecast-kh-icecast-2.4.0-kh10_GH0.tar.gz) = 783684db7b199b0e4096fcbd9f1b4c50bb79542e1a33dbaf6d817b2ba4150d33
		3	SIZE (karlheyes-icecast-kh-icecast-2.4.0-kh10_GH0.tar.gz) = 1004087

Lines 1-6 Link Here

(-)files/patch-conf_Makefile.in (-2 / +2 lines)
1	--- conf/Makefile.in.orig 2014-02-18 01:46:17 UTC	1	--- conf/Makefile.in.orig 2018-05-27 23:59:38 UTC
2	+++ conf/Makefile.in	2	+++ conf/Makefile.in
3	@@ -459,8 +459,7 @@ uninstall-am: uninstall-docDATA	3	@@ -547,8 +547,7 @@ uninstall-am: uninstall-docDATA
4		4
5	install-data-hook:	5	install-data-hook:
6	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)	6	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)




--- configure.orig	2018-05-27 23:59:38 UTC
+++ configure
@@ -821,6 +821,7 @@ with_theora
 with_speex
 with_curl
 with_curl_config

 enable_yp
 with_openssl
 '
@@ -18746,6 +18747,16 @@ $as_echo "$as_me: WARNING: Speex support
 
 fi
 

 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kate_decode_init in -lkate" >&5
 $as_echo_n "checking for kate_decode_init in -lkate... " >&6; }
@@ -18843,6 +18854,7 @@ $as_echo "#define HAVE_KATE 1" >>confdef
 fi
 #ICECAST_OPTIONAL="$ICECAST_OPTIONAL format_kate.o"
 




--- src/auth_cmd.c.orig	2018-08-29 15:48:26 UTC
+++ src/auth_cmd.c
@@ -35,9 +35,7 @@
 #ifdef HAVE_POLL
 #include <poll.h>
 #endif
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 
 #include "auth.h"
 #include "util.h"

Return to bug 230814

Lines 4-10 Link Here

(-)Makefile (-25 / +17 lines)
4	PORTNAME= icecast	4	PORTNAME= icecast
5	DISTVERSIONPREFIX= icecast-	5	DISTVERSIONPREFIX= icecast-
6	DISTVERSION= ${ICVERSION}-kh${KH}	6	DISTVERSION= ${ICVERSION}-kh${KH}
7	PORTREVISION= 3	7	PORTREVISION= 4
8	CATEGORIES= audio net ipv6	8	CATEGORIES= audio net ipv6
9	PKGNAMESUFFIX= -kh	9	PKGNAMESUFFIX= -kh
10		10
Lines 12-17 Link Here
12	COMMENT= Streaming mp3/ogg-vorbis audio server, KH branch	12	COMMENT= Streaming mp3/ogg-vorbis audio server, KH branch
13		13
14	LICENSE= GPLv2	14	LICENSE= GPLv2
		15	LICENSE_FILE= ${WRKSRC}/COPYING
15		16
16	LIB_DEPENDS= libogg.so:audio/libogg \	17	LIB_DEPENDS= libogg.so:audio/libogg \
17	libtheora.so:multimedia/libtheora \	18	libtheora.so:multimedia/libtheora \
Lines 19-28 Link Here
19	libxml2.so:textproc/libxml2 \	20	libxml2.so:textproc/libxml2 \
20	libxslt.so:textproc/libxslt	21	libxslt.so:textproc/libxslt
21		22
22	USE_GITHUB= yes
23	GH_ACCOUNT= karlheyes
24	GH_PROJECT= icecast-kh
25
26	USES= gmake pkgconfig ssl	23	USES= gmake pkgconfig ssl
27	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
28	USE_RC_SUBR= ${PORTNAME}	25	USE_RC_SUBR= ${PORTNAME}
Lines 31-37 Link Here
31	CFLAGS+= -I${LOCALBASE}/include	28	CFLAGS+= -I${LOCALBASE}/include
32	LDFLAGS+= -L${LOCALBASE}/lib	29	LDFLAGS+= -L${LOCALBASE}/lib
33		30
34	ICVERSION= 2.3.3	31	USE_GITHUB= yes
		32	GH_ACCOUNT= karlheyes
		33	GH_PROJECT= icecast-kh
		34
		35	ICVERSION= 2.4.0
35	KH= 10	36	KH= 10
36		37
37	OPTIONS_DEFINE= CURL DOCS KATE SPEEX	38	OPTIONS_DEFINE= CURL DOCS KATE SPEEX
Lines 40-67 Link Here
40	KATE_DESC= Support Kate/Skeleton codec within Ogg streams	41	KATE_DESC= Support Kate/Skeleton codec within Ogg streams
41	SPEEX_DESC= Support Speex codec within Ogg streams	42	SPEEX_DESC= Support Speex codec within Ogg streams
42		43
43	CONFLICTS_INSTALL= icecast-[0-9]* icecast2-[0-9]*	44	CURL_BUILD_DEPENDS= curl>=7.10:ftp/curl
		45	CURL_CONFIGURE_WITH= curl=${LOCALBASE}
		46	CURL_LIB_DEPENDS= libcurl.so:ftp/curl
44		47
45	.include <bsd.port.options.mk>	48	KATE_CONFIGURE_WITH= kate
		49	KATE_LIB_DEPENDS= libkate.so:multimedia/libkate
46		50
47	.if ${PORT_OPTIONS:MCURL}	51	SPEEX_BUILD_DEPENDS= speex>=1:audio/speex
48	BUILD_DEPENDS+= curl>=7.10:ftp/curl	52	SPEEX_CONFIGURE_WITH= speex=${LOCALBASE}
49	CONFIGURE_ARGS+= --with-curl=${LOCALBASE}	53	SPEEX_LIB_DEPENDS= libspeex.so:audio/speex
50	.else
51	CONFIGURE_ARGS+= --without-curl
52	.endif
53		54
54	.if ${PORT_OPTIONS:MKATE}	55	CONFLICTS_INSTALL= icecast-[0-9]* icecast2-[0-9]*
55	LIB_DEPENDS+= libkate.so:multimedia/libkate
56	.else
57	CONFIGURE_ARGS+= --without-kate
58	.endif
59		56
60	.if ${PORT_OPTIONS:MSPEEX}	57	.include <bsd.port.options.mk>
61	BUILD_DEPENDS+= speex>=1:audio/speex
62	CONFIGURE_ARGS+= --with-speex=${LOCALBASE}
63	.else
64	CONFIGURE_ARGS+= --without-speex
65	.endif
66		58
67	.include <bsd.port.mk>	59	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)files/patch-configure (-4 / +4 lines)
1	--- configure.orig 2014-02-18 01:46:17 UTC	1	--- configure.orig 2018-05-27 23:59:38 UTC
2	+++ configure	2	+++ configure
3	@@ -793,6 +793,7 @@ with_theora	3	@@ -821,6 +821,7 @@ with_theora
4	with_speex	4	with_speex
5	with_curl	5	with_curl
6	with_curl_config	6	with_curl_config
Lines 8-14 Link Here
8	enable_yp	8	enable_yp
9	with_openssl	9	with_openssl
10	'	10	'
11	@@ -17648,6 +17649,16 @@ $as_echo "$as_me: WARNING: Speex support	11	@@ -18746,6 +18747,16 @@ $as_echo "$as_me: WARNING: Speex support
12		12
13	fi	13	fi
14		14
Lines 25-31 Link Here
25		25
26	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kate_decode_init in -lkate" >&5	26	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kate_decode_init in -lkate" >&5
27	$as_echo_n "checking for kate_decode_init in -lkate... " >&6; }	27	$as_echo_n "checking for kate_decode_init in -lkate... " >&6; }
28	@@ -17745,6 +17756,7 @@ $as_echo "#define HAVE_KATE 1" >>confdef	28	@@ -18843,6 +18854,7 @@ $as_echo "#define HAVE_KATE 1" >>confdef
29	fi	29	fi
30	#ICECAST_OPTIONAL="$ICECAST_OPTIONAL format_kate.o"	30	#ICECAST_OPTIONAL="$ICECAST_OPTIONAL format_kate.o"
31		31

Line 0 Link Here

(-)files/patch-src_auth__cmd.c (+12 lines)
	1	--- src/auth_cmd.c.orig 2018-08-29 15:48:26 UTC
	2	+++ src/auth_cmd.c
	3	@@ -35,9 +35,7 @@
	4	#ifdef HAVE_POLL
	5	#include <poll.h>
	6	#endif
	7	-#ifdef HAVE_SIGNAL_H
	8	#include <signal.h>
	9	-#endif
	10
	11	#include "auth.h"
	12	#include "util.h"