From c8ac0e6acde44ca5814807a63595defb09cf3cad Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Fri, 29 Jun 2018 15:44:33 +0000 Subject: [PATCH] Simplify CONFLICTS_INSTALL. Reported by: mat --- security/openssh-portable/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 417ae8ff52a0..282dee25cc93 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 7.7p1 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= OPENBSD/OpenSSH/portable @@ -30,8 +30,8 @@ BROKEN_SSL= openssl-devel BROKEN_SSL_REASON_openssl-devel= error: OpenSSL >= 1.1.0 is not yet supported FLAVORS= default hpn -default_CONFLICTS_INSTALL= openssl-portable-hpn-[0-9]* -hpn_CONFLICTS_INSTALL= openssh-portable-[0-9]* +default_CONFLICTS_INSTALL= openssl-portable-hpn +hpn_CONFLICTS_INSTALL= openssh-portable hpn_PKGNAMESUFFIX= -portable-hpn OPTIONS_DEFINE= PAM TCP_WRAPPERS LIBEDIT BSM \