From owner-svn-ports-all@freebsd.org  Sun Oct 30 15:16:02 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 EF699C25F3D;
 Sun, 30 Oct 2016 15:16:02 +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 B951F131F;
 Sun, 30 Oct 2016 15:16:02 +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 u9UFG1XJ093326;
 Sun, 30 Oct 2016 15:16:01 GMT (envelope-from brnrd@FreeBSD.org)
Received: (from brnrd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9UFG1FZ093325;
 Sun, 30 Oct 2016 15:16:01 GMT (envelope-from brnrd@FreeBSD.org)
Message-Id: <201610301516.u9UFG1FZ093325@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brnrd set sender to
 brnrd@FreeBSD.org using -f
From: Bernard Spil <brnrd@FreeBSD.org>
Date: Sun, 30 Oct 2016 15:16:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r424949 - head/security/acme-client
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: Sun, 30 Oct 2016 15:16:03 -0000

Author: brnrd
Date: Sun Oct 30 15:16:01 2016
New Revision: 424949
URL: https://svnweb.freebsd.org/changeset/ports/424949

Log:
  security/acme-client: Fix CONFLICT errors when OpenSSL is installed
  
    - As reported for OpenNTPd
  
  PR:		213691
  Reported by:	Simeon Simeonov <blackmore@pichove.org>

Modified:
  head/security/acme-client/Makefile

Modified: head/security/acme-client/Makefile
==============================================================================
--- head/security/acme-client/Makefile	Sun Oct 30 15:13:27 2016	(r424948)
+++ head/security/acme-client/Makefile	Sun Oct 30 15:16:01 2016	(r424949)
@@ -14,7 +14,7 @@ COMMENT=	Native C client for Let's Encry
 
 LICENSE=	ISCL
 
-USES=		gmake ssl tar:tgz
+USES=		gmake tar:tgz
 
 MAKEFILE=	GNUmakefile
 MAKE_ENV=	PREFIX=${STAGEDIR}/${PREFIX}
@@ -47,10 +47,12 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-.if ! ${SSL_DEFAULT:Mlibressl*}
-BUILD_DEPENDS+=		${NONEXISTENT}:security/libressl:stage
-CPPFLAGS+=		-I${WRKDIR}/libressl/include
-LDFLAGS+=		-L${WRKDIR}/libressl/lib
+.if ${SSL_DEFAULT:Mlibressl*}
+USES+=		ssl
+.else
+BUILD_DEPENDS+=	${NONEXISTENT}:security/libressl:stage
+CPPFLAGS+=	-I${WRKDIR}/libressl/include
+LDFLAGS+=	-L${WRKDIR}/libressl/lib
 . ifnmake describe
 STAGEDIR_libressl!=	${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
 . endif