Index: Makefile
===================================================================
--- Makefile	(révision 478349)
+++ Makefile	(copie de travail)
@@ -4,7 +4,7 @@
 PORTNAME=	icecast
 DISTVERSIONPREFIX=	icecast-
 DISTVERSION=	${ICVERSION}-kh${KH}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio net ipv6
 PKGNAMESUFFIX=	-kh
 
@@ -12,6 +12,7 @@
 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 \
@@ -19,10 +20,6 @@
 		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}
@@ -31,7 +28,11 @@
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-ICVERSION=	2.3.3
+USE_GITHUB=	yes
+GH_ACCOUNT=	karlheyes
+GH_PROJECT=	icecast-kh
+
+ICVERSION=	2.4.0
 KH=		10
 
 OPTIONS_DEFINE=		CURL DOCS KATE SPEEX
@@ -40,28 +41,19 @@
 KATE_DESC=		Support Kate/Skeleton codec within Ogg streams
 SPEEX_DESC=		Support Speex codec within Ogg streams
 
-CONFLICTS_INSTALL=	icecast-[0-9]* icecast2-[0-9]*
+CURL_BUILD_DEPENDS=	curl>=7.10:ftp/curl
+CURL_CONFIGURE_WITH=	curl=${LOCALBASE}
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
-.include <bsd.port.options.mk>
+KATE_CONFIGURE_WITH=	kate
+KATE_LIB_DEPENDS=	libkate.so:multimedia/libkate
 
-.if ${PORT_OPTIONS:MCURL}
-BUILD_DEPENDS+=	curl>=7.10:ftp/curl
-CONFIGURE_ARGS+=	--with-curl=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-curl
-.endif
+SPEEX_BUILD_DEPENDS=	speex>=1:audio/speex
+SPEEX_CONFIGURE_WITH=	speex=${LOCALBASE}
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 
-.if ${PORT_OPTIONS:MKATE}
-LIB_DEPENDS+=	libkate.so:multimedia/libkate
-.else
-CONFIGURE_ARGS+=	--without-kate
-.endif
+CONFLICTS_INSTALL=	icecast-[0-9]* icecast2-[0-9]*
 
-.if ${PORT_OPTIONS:MSPEEX}
-BUILD_DEPENDS+=	speex>=1:audio/speex
-CONFIGURE_ARGS+=	--with-speex=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-speex
-.endif
+.include <bsd.port.options.mk>
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(révision 478349)
+++ distinfo	(copie de travail)
@@ -1,2 +1,3 @@
-SHA256 (karlheyes-icecast-kh-icecast-2.3.3-kh10_GH0.tar.gz) = c5d6e2fefe27ccc819e460bb27c67c876d66ed7ae89b094674d9e4e9857d74e4
-SIZE (karlheyes-icecast-kh-icecast-2.3.3-kh10_GH0.tar.gz) = 922537
+TIMESTAMP = 1535557669
+SHA256 (karlheyes-icecast-kh-icecast-2.4.0-kh10_GH0.tar.gz) = 783684db7b199b0e4096fcbd9f1b4c50bb79542e1a33dbaf6d817b2ba4150d33
+SIZE (karlheyes-icecast-kh-icecast-2.4.0-kh10_GH0.tar.gz) = 1004087
Index: files/patch-conf_Makefile.in
===================================================================
--- files/patch-conf_Makefile.in	(révision 478349)
+++ files/patch-conf_Makefile.in	(copie de travail)
@@ -1,6 +1,6 @@
---- conf/Makefile.in.orig	2014-02-18 01:46:17 UTC
+--- conf/Makefile.in.orig	2018-05-27 23:59:38 UTC
 +++ conf/Makefile.in
-@@ -459,8 +459,7 @@ uninstall-am: uninstall-docDATA
+@@ -547,8 +547,7 @@ uninstall-am: uninstall-docDATA
  
  install-data-hook:
  	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
Index: files/patch-configure
===================================================================
--- files/patch-configure	(révision 478349)
+++ files/patch-configure	(copie de travail)
@@ -1,6 +1,6 @@
---- configure.orig	2014-02-18 01:46:17 UTC
+--- configure.orig	2018-05-27 23:59:38 UTC
 +++ configure
-@@ -793,6 +793,7 @@ with_theora
+@@ -821,6 +821,7 @@ with_theora
  with_speex
  with_curl
  with_curl_config
@@ -8,7 +8,7 @@
  enable_yp
  with_openssl
  '
-@@ -17648,6 +17649,16 @@ $as_echo "$as_me: WARNING: Speex support
+@@ -18746,6 +18747,16 @@ $as_echo "$as_me: WARNING: Speex support
  
  fi
  
@@ -25,7 +25,7 @@
  
  { $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; }
-@@ -17745,6 +17756,7 @@ $as_echo "#define HAVE_KATE 1" >>confdef
+@@ -18843,6 +18854,7 @@ $as_echo "#define HAVE_KATE 1" >>confdef
  fi
  #ICECAST_OPTIONAL="$ICECAST_OPTIONAL format_kate.o"
  
Index: files/patch-src_auth__cmd.c
===================================================================
--- files/patch-src_auth__cmd.c	(nonexistent)
+++ files/patch-src_auth__cmd.c	(copie de travail)
@@ -0,0 +1,12 @@
+--- 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"

Property changes on: files/patch-src_auth__cmd.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property