From owner-svn-ports-all@freebsd.org  Wed Nov  2 07:15:10 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
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 60578C2BD10;
 Wed,  2 Nov 2016 07:15:10 +0000 (UTC)
 (envelope-from jbeich@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 E131D10C5;
 Wed,  2 Nov 2016 07:15:09 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA27F9XP074309;
 Wed, 2 Nov 2016 07:15:09 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA27F9Np074308;
 Wed, 2 Nov 2016 07:15:09 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201611020715.uA27F9Np074308@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Wed, 2 Nov 2016 07:15:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r425117 - head/security/openssl-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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Nov 2016 07:15:10 -0000

Author: jbeich
Date: Wed Nov  2 07:15:08 2016
New Revision: 425117
URL: https://svnweb.freebsd.org/changeset/ports/425117

Log:
  security/openssl-devel: adjust conflicts like r422717 and r424947
  
  This permits bundling when DEPENDS_TARGET != install e.g.,
  
    BUILD_DEPENDS += ${NONEXISTENT}:security/openssl-devel:stage
  
    CPPFLAGS+=		-I${WRKDIR}/openssl-devel/include
    LDFLAGS+=		-L${WRKDIR}/openssl-devel/lib
  
    pre-configure:
  	@(cd `${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/openssl-devel`${LOCALBASE} \
  	    && ${COPYTREE_SHARE} . ${WRKDIR}/openssl-devel "! -name *.so*")
  
  PR:		213889
  Approved by:	portmgr blanket

Modified:
  head/security/openssl-devel/Makefile   (contents, props changed)

Modified: head/security/openssl-devel/Makefile
==============================================================================
--- head/security/openssl-devel/Makefile	Wed Nov  2 06:39:57 2016	(r425116)
+++ head/security/openssl-devel/Makefile	Wed Nov  2 07:15:08 2016	(r425117)
@@ -15,9 +15,9 @@ COMMENT=	SSL and crypto library (1.1.x)
 LICENSE=	OpenSSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CONFLICTS=	libressl-[0-9]* \
-		libressl-devel-[0-9]* \
-		openssl-[0-9]*
+CONFLICTS_INSTALL=	libressl-[0-9]* \
+			libressl-devel-[0-9]* \
+			openssl-[0-9]*
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config