Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Dec 2018 13:08:51 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r486860 - in head/audio/icecast-kh: . files
Message-ID:  <201812071308.wB7D8pn2068812@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Fri Dec  7 13:08:51 2018
New Revision: 486860
URL: https://svnweb.freebsd.org/changeset/ports/486860

Log:
  audio/icecast-kh: Update to 2.4.0-kh10
  
  - Convert to options helpers
  - Drop incidental variables
  - Reset maintainer due to the long timeout
  
  Changes:	https://raw.githubusercontent.com/karlheyes/icecast-kh/icecast-2.4.0-kh10/NEWS
  PR:		230814
  Reported by:	shon@misproductions.com
  Submitted by:	Samy Mahmoudi <samy.mahmoudi@gmail.com> (based on)
  Approved by:	anes@anes.su (maintainer timeout, > 3 months)

Added:
  head/audio/icecast-kh/files/patch-src_auth__cmd.c   (contents, props changed)
Modified:
  head/audio/icecast-kh/Makefile
  head/audio/icecast-kh/distinfo
  head/audio/icecast-kh/pkg-plist

Modified: head/audio/icecast-kh/Makefile
==============================================================================
--- head/audio/icecast-kh/Makefile	Fri Dec  7 11:52:40 2018	(r486859)
+++ head/audio/icecast-kh/Makefile	Fri Dec  7 13:08:51 2018	(r486860)
@@ -1,67 +1,50 @@
 # Created by: Anes Mukhametov <anes@anes.su>
 # $FreeBSD$
 
-PORTNAME=	icecast
+PORTNAME=	icecast-kh
 DISTVERSIONPREFIX=	icecast-
-DISTVERSION=	${ICVERSION}-kh${KH}
-PORTREVISION=	3
+DISTVERSION=	2.4.0-kh10
 CATEGORIES=	audio net ipv6
-PKGNAMESUFFIX=	-kh
 
-MAINTAINER=	anes@anes.su
+MAINTAINER=	ports@FreeBSD.org
 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 \
-		libvorbis.so:audio/libvorbis \
-		libxml2.so:textproc/libxml2 \
-		libxslt.so:textproc/libxslt
+		libvorbis.so:audio/libvorbis
 
+USES=		gmake gnome localbase pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	karlheyes
-GH_PROJECT=	icecast-kh
+USE_GNOME=	libxml2 libxslt
+USE_RC_SUBR=	icecast
 
-USES=		gmake pkgconfig ssl
+CONFLICTS_INSTALL=	icecast icecast2
+
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	${PORTNAME}
-SUB_FILES=	pkg-message
 CONFIGURE_ENV=	OGG_PREFIX=${LOCALBASE}
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+# /usr/bin/ld: error: undefined symbol: ERR_get_error
+LIBS+=		-L${OPENSSLLIB} -lcrypto
 
-ICVERSION=	2.3.3
-KH=		10
+SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		CURL DOCS KATE SPEEX
 OPTIONS_DEFAULT=	CURL KATE SPEEX
+
 CURL_DESC=		Support Directory server interaction (YP) via curl
 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_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
-
-.if ${PORT_OPTIONS:MKATE}
-LIB_DEPENDS+=	libkate.so:multimedia/libkate
-.else
-CONFIGURE_ARGS+=	--without-kate
-.endif
-
-.if ${PORT_OPTIONS:MSPEEX}
-BUILD_DEPENDS+=	speex>=1:audio/speex
-CONFIGURE_ARGS+=	--with-speex=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-speex
-.endif
+SPEEX_CONFIGURE_WITH=	speex=${LOCALBASE}
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 
 .include <bsd.port.mk>

Modified: head/audio/icecast-kh/distinfo
==============================================================================
--- head/audio/icecast-kh/distinfo	Fri Dec  7 11:52:40 2018	(r486859)
+++ head/audio/icecast-kh/distinfo	Fri Dec  7 13:08:51 2018	(r486860)
@@ -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

Added: head/audio/icecast-kh/files/patch-src_auth__cmd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/icecast-kh/files/patch-src_auth__cmd.c	Fri Dec  7 13:08:51 2018	(r486860)
@@ -0,0 +1,14 @@
+https://github.com/karlheyes/icecast-kh/pull/231
+
+--- 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"

Modified: head/audio/icecast-kh/pkg-plist
==============================================================================
--- head/audio/icecast-kh/pkg-plist	Fri Dec  7 11:52:40 2018	(r486859)
+++ head/audio/icecast-kh/pkg-plist	Fri Dec  7 13:08:51 2018	(r486860)
@@ -1,7 +1,7 @@
 bin/icecast
 etc/icecast.xml.sample
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
+@comment %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812071308.wB7D8pn2068812>