From owner-svn-ports-head@FreeBSD.ORG Thu Sep 5 14:37:35 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B816365F; Thu, 5 Sep 2013 14:37:35 +0000 (UTC) (envelope-from sem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 96FE023EC; Thu, 5 Sep 2013 14:37:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r85EbZVQ075232; Thu, 5 Sep 2013 14:37:35 GMT (envelope-from sem@svn.freebsd.org) Received: (from sem@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r85EbZaP075216; Thu, 5 Sep 2013 14:37:35 GMT (envelope-from sem@svn.freebsd.org) Message-Id: <201309051437.r85EbZaP075216@svn.freebsd.org> From: Sergey Matveychuk Date: Thu, 5 Sep 2013 14:37:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326404 - in head/dns: ldns unbound X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Sep 2013 14:37:35 -0000 Author: sem Date: Thu Sep 5 14:37:34 2013 New Revision: 326404 URL: http://svnweb.freebsd.org/changeset/ports/326404 Log: - Do not depend on security/openssl if openssl in base is sufficient. PR: ports/178262 Submitted by: Jan Beich Reviewed by: ldns' port maintainer Modified: head/dns/ldns/Makefile head/dns/unbound/Makefile Modified: head/dns/ldns/Makefile ============================================================================== --- head/dns/ldns/Makefile Thu Sep 5 14:33:01 2013 (r326403) +++ head/dns/ldns/Makefile Thu Sep 5 14:37:34 2013 (r326404) @@ -3,7 +3,7 @@ PORTNAME= ldns PORTVERSION= 1.6.16 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns MASTER_SITES= http://www.nlnetlabs.nl/downloads/ldns/ \ CRITICAL @@ -268,7 +268,9 @@ PLIST_SUB+= EXAMPLES="@comment " .endif # BUILD_PYLDNS .if ${PORT_OPTIONS:MGOST} +. if ${OSVERSION} < 1000015 BUILD_DEPENDS+= openssl>=1.0:${PORTSDIR}/security/openssl +. endif .else NO_GOST= --disable-gost CONFIGURE_ARGS+=${NO_GOST} Modified: head/dns/unbound/Makefile ============================================================================== --- head/dns/unbound/Makefile Thu Sep 5 14:33:01 2013 (r326403) +++ head/dns/unbound/Makefile Thu Sep 5 14:37:34 2013 (r326404) @@ -1,13 +1,9 @@ -# New ports collection makefile for: unbound -# Date created: 25 Apr 2008 -# Whom: Sergey Matveychuk -# +# Created by: Sergey Matveychuk # $FreeBSD$ -# PORTNAME= unbound PORTVERSION= 1.4.20 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= http://unbound.net/downloads/ @@ -49,13 +45,13 @@ OPTIONS_DEFINE= THREADS PYTHON GOST ECDS OPTIONS_DEFAULT=THREADS ECDSA OPTIONS_RADIO= LIBEVENT -OPTIONS_RADIO_LIBEVENT= LIBEVENT14 LIBEVENT20 +OPTIONS_RADIO_LIBEVENT= LIBEVENT14 LIBEVENT20 LIBEVENT_DESC= Enable whenever using many (10000) outgoing ports LIBEVENT14_DESC=Build against libevent-1.4 (devel/libevent) LIBEVENT20_DESC=Build against libevent-2.0 (devel/libevent2) -GOST_DESC= Enable GOST support (requires OpenSSL from ports) -ECDSA_DESC= Enable ECDSA (elliptic curve) support +GOST_DESC= Enable GOST support (requires OpenSSL >= 1.0) +ECDSA_DESC= Enable ECDSA (elliptic curve) support (OpenSSL >= 1.0) MUNIN_DESC= Install Munin plugin .include @@ -73,14 +69,15 @@ PYTHON= "@comment " .endif .if ${PORT_OPTIONS:MGOST} +. if ${OSVERSION} < 1000015 WITH_OPENSSL_PORT= yes +. endif DEPENDS_ARGS+= WITH_GOST=yes .else CONFIGURE_ARGS+=--disable-gost .endif .if ${PORT_OPTIONS:MECDSA} -WITH_OPENSSL_PORT=yes DEPENDS_ARGS+= WITH_ECDSA=yes .else CONFIGURE_ARGS+=--disable-ecdsa @@ -133,7 +130,7 @@ post-install: @${CAT} ${WRKDIR}/pkg-message @${ECHO_MSG} "=============================================================" .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR}; \ for f in ${PORTDOCS}; do \ cd ${WRKSRC}/doc && ${INSTALL_DATA} $${f} ${DOCSDIR}/; \