From owner-svn-ports-all@freebsd.org Wed Oct 26 14:05:23 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0363BC22823; Wed, 26 Oct 2016 14:05:23 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C7B98A49; Wed, 26 Oct 2016 14:05:22 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9QE5LCX055398; Wed, 26 Oct 2016 14:05:21 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9QE5Lr7055397; Wed, 26 Oct 2016 14:05:21 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201610261405.u9QE5Lr7055397@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 26 Oct 2016 14:05:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424705 - head/audio/icecast-kh X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2016 14:05:23 -0000 Author: mat Date: Wed Oct 26 14:05:21 2016 New Revision: 424705 URL: https://svnweb.freebsd.org/changeset/ports/424705 Log: The OpenSSL selection is done globally with DEFAULT_VERSIONS. Sponsored by: Absolight Modified: head/audio/icecast-kh/Makefile (contents, props changed) Modified: head/audio/icecast-kh/Makefile ============================================================================== --- head/audio/icecast-kh/Makefile Wed Oct 26 14:02:07 2016 (r424704) +++ head/audio/icecast-kh/Makefile Wed Oct 26 14:05:21 2016 (r424705) @@ -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=${LOCALBAS CONFIGURE_ARGS+= --without-speex .endif -.if ${PORT_OPTIONS:MSSL_PORT} -WITH_OPENSSL_PORT= yes -.else -WITH_OPENSSL_BASE= yes -.endif - .include