From owner-svn-ports-head@freebsd.org Wed Apr 6 13:53:11 2016 Return-Path: Delivered-To: svn-ports-head@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 27387B05533; Wed, 6 Apr 2016 13:53:11 +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 02C0D1EFF; Wed, 6 Apr 2016 13:53:10 +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 u36DrA3l055321; Wed, 6 Apr 2016 13:53:10 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u36Dr9Kc055318; Wed, 6 Apr 2016 13:53:10 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201604061353.u36Dr9Kc055318@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 6 Apr 2016 13:53:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412619 - in head/dns: bind9-devel bind910 bind99 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.21 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: Wed, 06 Apr 2016 13:53:11 -0000 Author: mat Date: Wed Apr 6 13:53:09 2016 New Revision: 412619 URL: https://svnweb.freebsd.org/changeset/ports/412619 Log: Stop bringing in OpenSSL from ports, it builds fine with the base one on 9, and WITH_OPENSSL_PORT does not belong in a port's Makefile anyway. Not bumping PORTREVISION because: - if you are building with poudriere, it will detect that a dependency has changed and rebuild it. - if you are building from ports, you will have OpenSSL from ports installed, and it will choose to use it. Sponsored by: Absolight Modified: head/dns/bind9-devel/Makefile (contents, props changed) head/dns/bind910/Makefile (contents, props changed) head/dns/bind99/Makefile (contents, props changed) Modified: head/dns/bind9-devel/Makefile ============================================================================== --- head/dns/bind9-devel/Makefile Wed Apr 6 13:33:56 2016 (r412618) +++ head/dns/bind9-devel/Makefile Wed Apr 6 13:53:09 2016 (r412619) @@ -195,15 +195,9 @@ PLIST_SUB+= NOBASE="" BASE="@comment " SUB_LIST+= NOBASE="" BASE="@comment " USE_RC_SUBR+= named SUB_FILES+= named.conf -.if ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} -WITH_OPENSSL_PORT=yes -.endif .else PLIST_SUB+= NOBASE="@comment " BASE="" SUB_LIST+= NOBASE="@comment " BASE="" -.if ${PORT_OPTIONS:MSSL} -WITH_OPENSSL_PORT= yes -.endif .endif PKGDEINSTALL= ${PKGINSTALL} @@ -211,6 +205,14 @@ PKGDEINSTALL= ${PKGINSTALL} PORTDOCS= * +.include + +.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && defined(WITH_OPENSSL_BASE) +BROKEN= OpenSSL from the base system does not support GOST, add \ + WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \ + that needs SSL. +.endif + post-extract: echo "SRCID=${HASH}" > ${WRKSRC}/srcid @@ -260,4 +262,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ ${STAGEDIR}${ETCDIR}/rndc.conf.sample -.include +.include Modified: head/dns/bind910/Makefile ============================================================================== --- head/dns/bind910/Makefile Wed Apr 6 13:33:56 2016 (r412618) +++ head/dns/bind910/Makefile Wed Apr 6 13:53:09 2016 (r412619) @@ -219,15 +219,9 @@ SUB_LIST+= NOBASE="" BASE="@comment " USE_RC_SUBR+= named SUB_FILES+= named.conf .endif # !defined(BIND_TOOLS_SLAVE) -.if ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} -WITH_OPENSSL_PORT=yes -.endif .else PLIST_SUB+= NOBASE="@comment " BASE="" SUB_LIST+= NOBASE="@comment " BASE="" -.if ${PORT_OPTIONS:MSSL} -WITH_OPENSSL_PORT= yes -.endif .endif PKGDEINSTALL= ${PKGINSTALL} @@ -235,6 +229,14 @@ PKGDEINSTALL= ${PKGINSTALL} PORTDOCS= * +.include + +.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && defined(WITH_OPENSSL_BASE) +BROKEN= OpenSSL from the base system does not support GOST, add \ + WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \ + that needs SSL. +.endif + post-patch: @${REINPLACE_CMD} -e 's|readline/readline.h|editline/readline.h|; \ s|readline/history.h|histedit.h|' \ @@ -293,4 +295,4 @@ post-install: .endif # BIND_TOOLS_SLAVE -.include +.include Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Wed Apr 6 13:33:56 2016 (r412618) +++ head/dns/bind99/Makefile Wed Apr 6 13:53:09 2016 (r412619) @@ -179,21 +179,23 @@ PLIST_SUB+= NOBASE="" BASE="@comment " SUB_LIST+= NOBASE="" BASE="@comment " USE_RC_SUBR+= named SUB_FILES+= named.conf -.if ${PORT_OPTIONS:MGOST} -WITH_OPENSSL_PORT=yes -.endif .else PLIST_SUB+= NOBASE="@comment " BASE="" SUB_LIST+= NOBASE="@comment " BASE="" -.if ${PORT_OPTIONS:MSSL} -WITH_OPENSSL_PORT= yes -.endif .endif PKGDEINSTALL= ${PKGINSTALL} PORTDOCS= * +.include + +.if ( ${PORT_OPTIONS:MGOST} ) && defined(WITH_OPENSSL_BASE) +BROKEN= OpenSSL from the base system does not support GOST, add \ + WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \ + that needs SSL. +.endif + post-patch: @${REINPLACE_CMD} -e 's|readline/readline.h|editline/readline.h|; \ s|readline/history.h|histedit.h|' \ @@ -241,4 +243,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ ${STAGEDIR}${ETCDIR}/rndc.conf.sample -.include +.include