From owner-svn-ports-all@freebsd.org Sun Oct 30 14:56:58 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 E332EC25B53; Sun, 30 Oct 2016 14:56:58 +0000 (UTC) (envelope-from brnrd@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 B265F1BF5; Sun, 30 Oct 2016 14:56:58 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9UEuvYJ085205; Sun, 30 Oct 2016 14:56:57 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9UEuvES085203; Sun, 30 Oct 2016 14:56:57 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201610301456.u9UEuvES085203@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 30 Oct 2016 14:56:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424947 - in head/security: libressl libressl-devel 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: Sun, 30 Oct 2016 14:56:59 -0000 Author: brnrd Date: Sun Oct 30 14:56:57 2016 New Revision: 424947 URL: https://svnweb.freebsd.org/changeset/ports/424947 Log: security/libressl: Switch to CONFLICTS_INSTALL - There's no conflict at build time PR: 213691 Modified: head/security/libressl-devel/Makefile head/security/libressl/Makefile Modified: head/security/libressl-devel/Makefile ============================================================================== --- head/security/libressl-devel/Makefile Sun Oct 30 14:28:48 2016 (r424946) +++ head/security/libressl-devel/Makefile Sun Oct 30 14:56:57 2016 (r424947) @@ -20,9 +20,9 @@ OPTIONS_DEFAULT= MAN3 NC MAN3_DESC= Install API manpages (section 3) NC_DESC= Install TLS-enabled netcat -CONFLICTS?= libressl-[0-9]* \ - openssl-[0-9]* \ - openssl-devel-[0-9]* +CONFLICTS_INSTALL= libressl-[0-9]* \ + openssl-[0-9]* \ + openssl-devel-[0-9]* GNU_CONFIGURE= yes USES= cpe libtool pathfix pkgconfig Modified: head/security/libressl/Makefile ============================================================================== --- head/security/libressl/Makefile Sun Oct 30 14:28:48 2016 (r424946) +++ head/security/libressl/Makefile Sun Oct 30 14:56:57 2016 (r424947) @@ -19,9 +19,9 @@ OPTIONS_DEFAULT= MAN3 NC MAN3_DESC= Install API manpages (section 3) NC_DESC= Install TLS-enabled netcat -CONFLICTS?= libressl-devel-[0-9]* \ - openssl-[0-9]* \ - openssl-devel-[0-9]* +CONFLICTS_INSTALL= libressl-devel-[0-9]* \ + openssl-[0-9]* \ + openssl-devel-[0-9]* GNU_CONFIGURE= yes USES= cpe libtool pathfix pkgconfig