git: 3ace20f8b9d8 - main - www/llhttp: Update to 6.0.7

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Thu, 07 Jul 2022 21:43:55 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3ace20f8b9d83e47ddb61b13c6d402b812c6f1ef

commit 3ace20f8b9d83e47ddb61b13c6d402b812c6f1ef
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-07-07 21:42:39 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-07-07 21:42:39 +0000

    www/llhttp: Update to 6.0.7
    
    Changes:        https://github.com/nodejs/llhttp/releases
---
 www/llhttp/Makefile                   |  7 ++++--
 www/llhttp/distinfo                   |  6 ++---
 www/llhttp/files/libllhttp.pc.in      | 10 ++++++++
 www/llhttp/files/patch-CMakeLists.txt | 46 -----------------------------------
 www/llhttp/pkg-plist                  |  3 +++
 5 files changed, 21 insertions(+), 51 deletions(-)

diff --git a/www/llhttp/Makefile b/www/llhttp/Makefile
index 459645e26c1d..16edde1c7e48 100644
--- a/www/llhttp/Makefile
+++ b/www/llhttp/Makefile
@@ -1,7 +1,7 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 
 PORTNAME=	llhttp
-PORTVERSION=	6.0.6
+PORTVERSION=	6.0.7
 DISTVERSIONPREFIX=	 release/v
 CATEGORIES=	www
 
@@ -13,9 +13,12 @@ LICENSE_FILE=	${WRKSRC}/LICENSE-MIT
 
 USES=		cmake cpe
 
-CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_ON=	BUILD_SHARED_LIBS BUILD_STATIC_LIBS
 
 GH_ACCOUNT=	nodejs
 USE_GITHUB=	yes
 
+post-patch:
+	@${CP} ${FILESDIR}/libllhttp.pc.in ${WRKSRC}/libllhttp.pc.in
+
 .include <bsd.port.mk>
diff --git a/www/llhttp/distinfo b/www/llhttp/distinfo
index 5ffafa331b3d..d5d3ab2c44bd 100644
--- a/www/llhttp/distinfo
+++ b/www/llhttp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1638556500
-SHA256 (nodejs-llhttp-release-v6.0.6_GH0.tar.gz) = 14023d0efce07a996a197d3b6b15020b26526605277e521f5aa10dacc3af67ad
-SIZE (nodejs-llhttp-release-v6.0.6_GH0.tar.gz) = 38535
+TIMESTAMP = 1657198939
+SHA256 (nodejs-llhttp-release-v6.0.7_GH0.tar.gz) = ffd9377865232345af858b1b21a0fbcccaa6bfe397acb2211562f90738342bd9
+SIZE (nodejs-llhttp-release-v6.0.7_GH0.tar.gz) = 40580
diff --git a/www/llhttp/files/libllhttp.pc.in b/www/llhttp/files/libllhttp.pc.in
new file mode 100644
index 000000000000..9b1362a41cc7
--- /dev/null
+++ b/www/llhttp/files/libllhttp.pc.in
@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@
+
+Name: libllhttp
+Description: Node.js llhttp Library
+Version: @PROJECT_VERSION@
+Libs: -L${libdir} -lllhttp
+Cflags: -I${includedir}
diff --git a/www/llhttp/files/patch-CMakeLists.txt b/www/llhttp/files/patch-CMakeLists.txt
deleted file mode 100644
index a4fdd7981dee..000000000000
--- a/www/llhttp/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
---- CMakeLists.txt.orig	2021-08-25 00:31:04 UTC
-+++ CMakeLists.txt
-@@ -9,7 +9,7 @@ set(CMAKE_C_STANDARD 99)
- # Options
- #
- # Generic option
--option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" OFF)
-+#option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" OFF)
- 
- # Source code
- set(LLHTTP_SOURCES
-@@ -23,9 +23,11 @@ set(LLHTTP_HEADERS
- )
- 
- add_library(llhttp)
-+add_library(llhttp_static STATIC)
- add_library(llhttp::llhttp ALIAS llhttp)
- 
- target_sources(llhttp PRIVATE ${LLHTTP_SOURCES} ${LLHTTP_HEADERS})
-+target_sources(llhttp_static PRIVATE ${LLHTTP_SOURCES} ${LLHTTP_HEADERS})
- 
- # On windows with Visual Studio, add a debug postfix so that release
- # and debug libraries can coexist.
-@@ -37,13 +39,22 @@ target_include_directories(llhttp PUBLIC
-   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-   $<INSTALL_INTERFACE:include>
- )
-+target_include_directories(llhttp_static PUBLIC
-+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-+  $<INSTALL_INTERFACE:include>
-+)
- 
-+
- set_target_properties(llhttp PROPERTIES PUBLIC_HEADER ${LLHTTP_HEADERS})
-+set_target_properties(llhttp_static PROPERTIES OUTPUT_NAME llhttp)
- 
- install(TARGETS llhttp
-         EXPORT llhttp
-         ARCHIVE DESTINATION lib
-         PUBLIC_HEADER DESTINATION include/
-+)
-+install(TARGETS llhttp_static
-+        ARCHIVE DESTINATION lib
- )
- 
- # This is required to work with FetchContent
diff --git a/www/llhttp/pkg-plist b/www/llhttp/pkg-plist
index d255355fd6c5..a33be41e561d 100644
--- a/www/llhttp/pkg-plist
+++ b/www/llhttp/pkg-plist
@@ -3,3 +3,6 @@ lib/cmake/llhttp/llhttp-config-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/llhttp/llhttp-config.cmake
 lib/libllhttp.a
 lib/libllhttp.so
+lib/libllhttp.so.6.0
+lib/libllhttp.so.6.0.5
+libdata/pkgconfig/libllhttp.pc