git: c7ebfa287cec - main - devel/libevent: register CONFLICTS_INSTALL with -devel port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 05 Jun 2023 15:37:45 UTC
The branch main has been updated by danfe:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c7ebfa287cecd6a76bfc4aebd69d4fe1d1d86404
commit c7ebfa287cecd6a76bfc4aebd69d4fe1d1d86404
Author: Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-06-05 15:36:44 +0000
Commit: Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-06-05 15:36:44 +0000
devel/libevent: register CONFLICTS_INSTALL with -devel port
While here, drop needless OPENSSL_{CPP,LD}FLAGS assignments.
With DEFAULT_VERSIONS+=ssl=openssl|libressl, the following
definitions end up in the ${WRKSRC}/Makefile without manual
specification of the paths, as they come from pkgconf(1):
OPENSSL_INCS = -I/usr/local/include
OPENSSL_LIBS = -L/usr/local/lib -lssl -lcrypto
With default OpenSSL implementation (base):
OPENSSL_INCS =
OPENSSL_LIBS = -lssl -lcrypto
---
devel/libevent/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index c921b55bd11b..77831a375b0b 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -19,13 +19,13 @@ INSTALL_TARGET= install-strip
TEST_TARGET= check
USE_LDCONFIG= yes
+CONFLICTS_INSTALL= ${PORTNAME}-devel
+
OPTIONS_DEFINE= OPENSSL THREADS
OPTIONS_DEFAULT= OPENSSL THREADS
OPTIONS_SUB= yes
OPENSSL_USES= ssl
-OPENSSL_CPPFLAGS= -I${OPENSSLINC}
-OPENSSL_LDFLAGS= -L${OPENSSLLIB}
OPENSSL_CONFIGURE_ENABLE= openssl
THREADS_CONFIGURE_ENABLE= thread-support