From owner-svn-ports-head@freebsd.org Sun Mar 6 20:06:43 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 5F1C0AC1528; Sun, 6 Mar 2016 20:06:43 +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 167298DF; Sun, 6 Mar 2016 20:06:43 +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 u26K6gw2010840; Sun, 6 Mar 2016 20:06:42 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u26K6fpM010837; Sun, 6 Mar 2016 20:06:41 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201603062006.u26K6fpM010837@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 6 Mar 2016 20:06:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410481 - in head/security: libressl libressl-devel openssl 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: Sun, 06 Mar 2016 20:06:43 -0000 Author: brnrd Date: Sun Mar 6 20:06:41 2016 New Revision: 410481 URL: https://svnweb.freebsd.org/changeset/ports/410481 Log: security/libressl*: Register conflict with security/openssl-devel - Add conflict for security/openssl-devel - Sort conflicts alphabetically Reviewed by: feld (mentor), koobs (mentor) Approved by: feld (mentor) Differential Revision: D5539 Modified: head/security/libressl-devel/Makefile head/security/libressl/Makefile head/security/openssl/Makefile Modified: head/security/libressl-devel/Makefile ============================================================================== --- head/security/libressl-devel/Makefile Sun Mar 6 20:00:32 2016 (r410480) +++ head/security/libressl-devel/Makefile Sun Mar 6 20:06:41 2016 (r410481) @@ -20,8 +20,9 @@ OPTIONS_DEFAULT= MAN3 NC MAN3_DESC= Install API manpages (section 3) NC_DESC= Build nc libtls demo application -CONFLICTS?= openssl-[0-9]* \ - libressl-[0-9]* +CONFLICTS?= 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 Mar 6 20:00:32 2016 (r410480) +++ head/security/libressl/Makefile Sun Mar 6 20:06:41 2016 (r410481) @@ -18,8 +18,9 @@ OPTIONS_DEFINE= MAN3 OPTIONS_DEFAULT= MAN3 MAN3_DESC= Install API manpages (section 3) -CONFLICTS?= openssl-[0-9]* \ - libressl-devel-[0-9]* +CONFLICTS?= libressl-devel-[0-9]* \ + openssl-[0-9]* \ + openssl-devel-[0-9]* GNU_CONFIGURE= yes USES= cpe libtool pathfix pkgconfig Modified: head/security/openssl/Makefile ============================================================================== --- head/security/openssl/Makefile Sun Mar 6 20:00:32 2016 (r410480) +++ head/security/openssl/Makefile Sun Mar 6 20:06:41 2016 (r410481) @@ -18,7 +18,9 @@ COMMENT= SSL and crypto library .error You have `USE_OPENSSL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif -CONFLICTS?= libressl-* openssl-devel-* +CONFLICTS?= libressl-[0-9]* \ + libressl-devel-[0-9]* \ + openssl-devel-[0-9]* LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE