Index: head/audio/icecast-kh/Makefile =================================================================== --- head/audio/icecast-kh/Makefile (revision 486859) +++ head/audio/icecast-kh/Makefile (revision 486860) @@ -1,67 +1,50 @@ # Created by: Anes Mukhametov # $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 +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 Index: head/audio/icecast-kh/distinfo =================================================================== --- head/audio/icecast-kh/distinfo (revision 486859) +++ head/audio/icecast-kh/distinfo (revision 486860) @@ -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: head/audio/icecast-kh/files/patch-src_auth__cmd.c =================================================================== --- head/audio/icecast-kh/files/patch-src_auth__cmd.c (nonexistent) +++ head/audio/icecast-kh/files/patch-src_auth__cmd.c (revision 486860) @@ -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 + #endif +-#ifdef HAVE_SIGNAL_H + #include +-#endif + + #include "auth.h" + #include "util.h" Property changes on: head/audio/icecast-kh/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 Index: head/audio/icecast-kh/pkg-plist =================================================================== --- head/audio/icecast-kh/pkg-plist (revision 486859) +++ head/audio/icecast-kh/pkg-plist (revision 486860) @@ -1,52 +1,52 @@ 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 %%PORTDOCS%%%%DOCSDIR%%/icecast2_admin.html %%PORTDOCS%%%%DOCSDIR%%/icecast2_basicsetup.html %%PORTDOCS%%%%DOCSDIR%%/icecast2_config_file.html %%PORTDOCS%%%%DOCSDIR%%/icecast2_faq.html %%PORTDOCS%%%%DOCSDIR%%/icecast2_glossary.html %%PORTDOCS%%%%DOCSDIR%%/icecast2_introduction.html %%PORTDOCS%%%%DOCSDIR%%/icecast2_listenerauth.html %%PORTDOCS%%%%DOCSDIR%%/icecast2_relay.html %%PORTDOCS%%%%DOCSDIR%%/icecast2_stats.html %%PORTDOCS%%%%DOCSDIR%%/icecast2_win32.html %%PORTDOCS%%%%DOCSDIR%%/icecast2_yp.html %%PORTDOCS%%%%DOCSDIR%%/index.html %%DATADIR%%/admin/listclients.xsl %%DATADIR%%/admin/listmounts.xsl %%DATADIR%%/admin/logs.xsl %%DATADIR%%/admin/manageauth.xsl %%DATADIR%%/admin/managerelays.xsl %%DATADIR%%/admin/moveclients.xsl %%DATADIR%%/admin/response.xsl %%DATADIR%%/admin/showlog.xsl %%DATADIR%%/admin/stats.xsl %%DATADIR%%/admin/updatemetadata.xsl %%DATADIR%%/admin/viewxml.xsl %%DATADIR%%/admin/xspf.xsl %%DATADIR%%/doc/icecast.xml.dist %%DATADIR%%/doc/icecast_minimal.xml.dist %%DATADIR%%/doc/icecast_shoutcast_compat.xml.dist %%DATADIR%%/web/7.xsl %%DATADIR%%/web/admin.html %%DATADIR%%/web/adminbar.html %%DATADIR%%/web/auth.xsl %%DATADIR%%/web/favicon.ico %%DATADIR%%/web/images/corner_bottomleft.jpg %%DATADIR%%/web/images/corner_bottomright.jpg %%DATADIR%%/web/images/corner_topleft.jpg %%DATADIR%%/web/images/corner_topright.jpg %%DATADIR%%/web/images/icecast.png %%DATADIR%%/web/images/key.png %%DATADIR%%/web/images/tunein.png %%DATADIR%%/web/index.html %%DATADIR%%/web/server_version.xsl %%DATADIR%%/web/status.xsl %%DATADIR%%/web/status2.xsl %%DATADIR%%/web/statusbar.html %%DATADIR%%/web/style.css