Attachment 176281 Details for Bug 213889 – partial fix (only poudriere)

[patch] partial fix (only poudriere)

libressl.conflicts.v0.diff (text/plain), 1.89 KB, created by Jan Beich on 2016-10-29 16:20:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-10-29 16:20:32 UTC

Size: 1.89 KB

patch

obsolete

>From 5fc7ab8b32f51164ffe991c6d12de99f3191abd7 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sat, 29 Oct 2016 16:01:59 +0000
>Subject: security/{libre,open}ssl: apply r422717 consistently
>
>This permits bundling the ports for DEPENDS_TARGET != install e.g.,
>
>  # from net/openntpd
>  BUILD_DEPENDS += ${NONEXISTENT}:security/libressl:stage
>
>PR:		213691
>
>diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile
>index 2cde312..bc73029 100644
>--- a/security/libressl-devel/Makefile
>+++ b/security/libressl-devel/Makefile
>@@ -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
>diff --git a/security/libressl/Makefile b/security/libressl/Makefile
>index 15c68ca..ac5954f 100644
>--- a/security/libressl/Makefile
>+++ b/security/libressl/Makefile
>@@ -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
>diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile
>index 4c999ed..4bc662e 100644
>--- a/security/openssl-devel/Makefile
>+++ b/security/openssl-devel/Makefile
>@@ -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

Actions: View | Diff

Attachments on bug 213889: 176281