From 5b55a8a53e383d5e641472b56a6d631e59da3967 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Thu, 16 Jun 2016 13:23:13 +0000 Subject: Fix usage of WITH_OPENSSL_BASE, WITH_OPENSSL_PORT and OPENSSL_PORT. WITH_OPENSSL_* can't be set after bsd.port.pre.mk. Fold all other usage into using SSL_DEFAULT == foo PR: 210149 Submitted by: mat Exp-run by: antoine Sponsored by: The FreeBSD Foundation, Absolight Differential Revision: https://reviews.freebsd.org/D6577 --- x11-servers/xorg-server/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'x11-servers/xorg-server') diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index bc12d5561842..26946dcc6213 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -64,7 +64,7 @@ PLIST= ${.CURDIR}/pkg-plist .include -.if defined(WITH_OPENSSL_BASE) +.if ${SSL_DEFAULT} == base # The reason why I use this is cause openssl from base doesn't install a .pc file # and configure will fail trying to find it. Setting both of those variables to # a *non-empty* value by-passes the pkg-config check. -- cgit v1.2.3