From 049b644311143bf39a917c11650675301907236f Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Wed, 26 Oct 2016 14:05:21 +0000 Subject: [PATCH] The OpenSSL selection is done globally with DEFAULT_VERSIONS. Sponsored by: Absolight --- audio/icecast-kh/Makefile | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/audio/icecast-kh/Makefile b/audio/icecast-kh/Makefile index 9597bf2d522f..b8288e6b989a 100644 --- a/audio/icecast-kh/Makefile +++ b/audio/icecast-kh/Makefile @@ -4,7 +4,7 @@ PORTNAME= icecast DISTVERSIONPREFIX= icecast- DISTVERSION= ${ICVERSION}-kh${KH} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio net ipv6 PKGNAMESUFFIX= -kh @@ -23,7 +23,7 @@ USE_GITHUB= yes GH_ACCOUNT= karlheyes GH_PROJECT= icecast-kh -USES= gmake pkgconfig +USES= gmake pkgconfig ssl GNU_CONFIGURE= yes USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message @@ -34,12 +34,11 @@ LDFLAGS+= -L${LOCALBASE}/lib ICVERSION= 2.3.3 KH= 10 -OPTIONS_DEFINE= CURL DOCS KATE SPEEX SSL_PORT +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 -SSL_PORT_DESC= Use OpenSSL from ports instead of one in the base CONFLICTS_INSTALL= icecast-[0-9]* icecast2-[0-9]* @@ -65,10 +64,4 @@ CONFIGURE_ARGS+= --with-speex=${LOCALBASE} CONFIGURE_ARGS+= --without-speex .endif -.if ${PORT_OPTIONS:MSSL_PORT} -WITH_OPENSSL_PORT= yes -.else -WITH_OPENSSL_BASE= yes -.endif - .include