View | Details | Raw Unified | Return to bug 271495
Collapse All | Expand All

(-)b/net/libwebsockets/Makefile (-7 / +1 lines)
Lines 1-6 Link Here
1 
PORTNAME=	libwebsockets
 1 
PORTNAME=	libwebsockets
2 
DISTVERSIONPREFIX=	v
 2 
DISTVERSIONPREFIX=	v
3 
DISTVERSION=	4.3.2
 3 
DISTVERSION=	4.3.2
4 
PORTREVISION=	1
4 
CATEGORIES=	net devel
 5 
CATEGORIES=	net devel
5 
MASTER_SITES=	https://libwebsockets.org/git/libwebsockets/snapshot/
 6 
MASTER_SITES=	https://libwebsockets.org/git/libwebsockets/snapshot/
6 

          7
          

        

  

    
      
            Lines 80-90
          LIBEVENT_CMAKE_BOOL=	LWS_WITH_LIBEVENT
      
      
        Link Here
      
    
  

        

          80
          
LIBUV_LIB_DEPENDS=	libuv.so:devel/libuv

          81
          
LIBUV_LIB_DEPENDS=	libuv.so:devel/libuv

        

        

          81
          
LIBUV_CMAKE_BOOL=	LWS_WITH_LIBUV

          82
          
LIBUV_CMAKE_BOOL=	LWS_WITH_LIBUV

        

        

          82
          

          83
          

        

            

              83
              
.include <bsd.port.options.mk>

              
              
            

            

              84
              

            

            

              85
              
# Allow usage of LibreSSL via OPENSSL option

            

            

              86
              
.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT} == libressl

            

            

              87
              
CMAKE_ARGS+=	-DLWS_OPENSSL_LIBRARIES='${OPENSSLLIB}/libtls.so;${OPENSSLLIB}/libssl.so;${OPENSSLLIB}/libcrypto.so' -DLWS_OPENSSL_INCLUDE_DIRS=${OPENSSLINC}/ssl

            

            

              88
              
.endif

            

            

              89
              

            

        

          90
          
.include <bsd.port.mk>

          84
          
.include <bsd.port.mk>

        



(-)b/net/libwebsockets/files/patch-lib_tls_CMakeLists.txt
      (-1 / +19 lines)




  

    
      
          Added
      
      
        Link Here
      
    
  

          
            

              0
              
- 


              1
              
Disable usage of pkg-config for OpenSSL to avoid linking two different versions.

            

            

              
              

              2
              
See PRs: 258345, 271495

            

            


              3
              

            

            


              4
              
--- lib/tls/CMakeLists.txt.orig	2023-05-19 06:48:43 UTC

            

            


              5
              
+++ lib/tls/CMakeLists.txt

            

            


              6
              
@@ -264,10 +264,10 @@ if (LWS_WITH_SSL)

            

            


              7
              
 		if (NOT OPENSSL_FOUND AND NOT LWS_WITH_BORINGSSL)

            

            


              8
              
 			# TODO: Add support for STATIC also.

            

            


              9
              
 			if (NOT LWS_PLAT_FREERTOS)

            

            


              10
              
-				find_package(PkgConfig QUIET)

            

            


              11
              
-				pkg_check_modules(PC_OPENSSL openssl QUIET)

            

            


              12
              
+				#find_package(PkgConfig QUIET)

            

            


              13
              
+				#pkg_check_modules(PC_OPENSSL openssl QUIET)

            

            


              14
              
 				find_package(OpenSSL REQUIRED)

            

            


              15
              
-				list(APPEND OPENSSL_LIBRARIES ${PC_OPENSSL_LIBRARIES})

            

            


              16
              
+				#list(APPEND OPENSSL_LIBRARIES ${PC_OPENSSL_LIBRARIES})

            

            


              17
              
 				set(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} PARENT_SCOPE)

            

            


              18
              
 			endif()

            

            


              19
              
 			set(OPENSSL_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}")

            






  

  Return to bug 271495