From 9a1a824faee84a6f68a36a4b25040ffc26057729 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 21 Jan 2021 22:43:51 +0000 Subject: [PATCH] Update www/cutelyst and related ports to latest upstream release Release notes are at https://dantti.wordpress.com/2021/01/19/cutelyst-2-14-2-and-asql-0-27-released/ There were patches from FreeBSD upstreamed, and some tidying-up, and there's a bunch of patches and benchmark improvements. --- databases/cutelyst-asql/Makefile | 2 +- databases/cutelyst-asql/distinfo | 6 ++-- www/cutelyst/Makefile | 2 +- www/cutelyst/distinfo | 6 ++-- www/cutelyst/files/patch-CMakeLists.txt | 38 ------------------------- www/cutelyst/pkg-plist | 2 ++ 6 files changed, 10 insertions(+), 46 deletions(-) delete mode 100644 www/cutelyst/files/patch-CMakeLists.txt diff --git a/databases/cutelyst-asql/Makefile b/databases/cutelyst-asql/Makefile index 7341b50c6f18..516ec837a33b 100644 --- a/databases/cutelyst-asql/Makefile +++ b/databases/cutelyst-asql/Makefile @@ -2,7 +2,7 @@ PORTNAME= asql DISTVERSIONPREFIX= v -DISTVERSION= 0.26.0 +DISTVERSION= 0.27.0 CATEGORIES= databases PKGNAMEPREFIX= cutelyst- diff --git a/databases/cutelyst-asql/distinfo b/databases/cutelyst-asql/distinfo index 4670ba9ddbd4..6bd938597cb0 100644 --- a/databases/cutelyst-asql/distinfo +++ b/databases/cutelyst-asql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609503064 -SHA256 (cutelyst-asql-v0.26.0_GH0.tar.gz) = ca30ace4f62e37f6644f7a56883f137d5e1341226cad347a675205e33857ce6b -SIZE (cutelyst-asql-v0.26.0_GH0.tar.gz) = 33150 +TIMESTAMP = 1611268564 +SHA256 (cutelyst-asql-v0.27.0_GH0.tar.gz) = 5d54dbdc0f97f2e63ade95bb3794bb8f5b7238cf7a248236b756c3146707260a +SIZE (cutelyst-asql-v0.27.0_GH0.tar.gz) = 33303 diff --git a/www/cutelyst/Makefile b/www/cutelyst/Makefile index 9b2d4f20eb28..b3146735370a 100644 --- a/www/cutelyst/Makefile +++ b/www/cutelyst/Makefile @@ -2,7 +2,7 @@ PORTNAME= cutelyst DISTVERSIONPREFIX= v -DISTVERSION= 2.14.0 +DISTVERSION= 2.14.2 CATEGORIES= www MAINTAINER= adridg@FreeBSD.org diff --git a/www/cutelyst/distinfo b/www/cutelyst/distinfo index 978d20fecef4..c0d7b6635588 100644 --- a/www/cutelyst/distinfo +++ b/www/cutelyst/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609503082 -SHA256 (cutelyst-cutelyst-v2.14.0_GH0.tar.gz) = 73115acaa1df8574bed4333b3ee142b09f1a7abe1272c19379392c1735e85bea -SIZE (cutelyst-cutelyst-v2.14.0_GH0.tar.gz) = 489834 +TIMESTAMP = 1611268580 +SHA256 (cutelyst-cutelyst-v2.14.2_GH0.tar.gz) = 5ff193f6bded151e6f5f9525bb93b8d4b4eac925ca83c557fd8471dd0ceca95a +SIZE (cutelyst-cutelyst-v2.14.2_GH0.tar.gz) = 490467 diff --git a/www/cutelyst/files/patch-CMakeLists.txt b/www/cutelyst/files/patch-CMakeLists.txt deleted file mode 100644 index b38c50fd36be..000000000000 --- a/www/cutelyst/files/patch-CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -FreeBSD isn't Linux, in spite of being a non-Apple UNIX. -There's unreached code in the patch showing how we *could* -do it if (when) libepoll-shim supports the whole API needed. - ---- CMakeLists.txt.orig 2019-02-15 20:30:30 UTC -+++ CMakeLists.txt -@@ -166,7 +166,30 @@ if(UNIX AND NOT (APPLE OR HAIKU)) - endif() - - if (LINUX) -- add_subdirectory(EventLoopEPoll) -+ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") -+ # FreeBSD isn't Linux, but it gets claimed as Linux, above. -+ # -+ # Try to find the EPOLL implementation from libepoll-shim; while -+ # epoll.h is found, and timerfd.h is found, the implementation -+ # in timerfd is insufficient (missing timerfd_gettime), and besides -+ # that there is also no eventfd.h. -+ # -+ # So, do the work of finding EPOLL, but don't use that subdirectory. -+ # Also, decide that we're not Linux after all. -+ find_file(EPOLL_H sys/epoll.h -+ HINTS libepoll-shim /usr/local/include/libepoll-shim -+ ) -+ if (EPOLL_H) -+ get_filename_component(EPOLL_SYS_DIR ${EPOLL_H} DIRECTORY) -+ get_filename_component(EPOLL_DIR ${EPOLL_SYS_DIR} DIRECTORY) -+ include_directories(${EPOLL_DIR}) -+ # add_subdirectory(EventLoopEPoll) -+ endif() -+ set(LINUX FALSE) -+ else() -+ # Real Linux -+ add_subdirectory(EventLoopEPoll) -+ endif() - endif() - - add_subdirectory(wsgi) diff --git a/www/cutelyst/pkg-plist b/www/cutelyst/pkg-plist index 5f14fb0ac410..eaba2aab9475 100644 --- a/www/cutelyst/pkg-plist +++ b/www/cutelyst/pkg-plist @@ -1,6 +1,7 @@ bin/cutelyst-wsgi2 bin/cutelyst2 include/cutelyst2-qt5/Cutelyst/Action +include/cutelyst2-qt5/Cutelyst/ActionChain include/cutelyst2-qt5/Cutelyst/Application include/cutelyst2-qt5/Cutelyst/Component include/cutelyst2-qt5/Cutelyst/Context @@ -94,6 +95,7 @@ include/cutelyst2-qt5/Cutelyst/Upload include/cutelyst2-qt5/Cutelyst/View include/cutelyst2-qt5/Cutelyst/WSGI/wsgi.h include/cutelyst2-qt5/Cutelyst/action.h +include/cutelyst2-qt5/Cutelyst/actionchain.h include/cutelyst2-qt5/Cutelyst/application.h include/cutelyst2-qt5/Cutelyst/async.h include/cutelyst2-qt5/Cutelyst/component.h