diff --git a/www/cutelyst/Makefile b/www/cutelyst/Makefile index 29055cdc752c..48036f75b7f9 100644 --- a/www/cutelyst/Makefile +++ b/www/cutelyst/Makefile @@ -1,38 +1,39 @@ PORTNAME= cutelyst DISTVERSIONPREFIX= v -DISTVERSION= 3.5.0 -PORTREVISION= 1 +DISTVERSION= 3.7.0 CATEGORIES= www MAINTAINER= adridg@FreeBSD.org COMMENT= C++/Qt web framework WWW= https://cutelyst.org LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim + USES= cmake compiler:c++11-lang localbase qt:5 USE_GITHUB= yes USE_LDCONFIG= yes USE_QT= qmake:build buildtools:build linguisttools:build \ core network sql # There are more views available and various plugins, # but we don't expose all of them in the port. OPTIONS_DEFINE= GRANTLEE OPTIONS_DEFAULT= GRANTLEE OPTIONS_SUB= yes GRANTLEE_DESC= Allow Grantlee templates GRANTLEE_USES= grantlee:5 GRANTLEE_CMAKE_BOOL= PLUGIN_VIEW_GRANTLEE CMAKE_ON= PLUGIN_CSRFPROTECTION \ PLUGIN_STATICCOMPRESSED CMAKE_OFF= BUILD_ALL BUILD_TESTS CMAKE_ARGS= -DMANDIR:PATH=share/man \ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=TRUE PLIST_SUB= SOVER=${DISTVERSION} .include diff --git a/www/cutelyst/distinfo b/www/cutelyst/distinfo index 4ab47a2e9870..abd9fdd9b85f 100644 --- a/www/cutelyst/distinfo +++ b/www/cutelyst/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1658233255 -SHA256 (cutelyst-cutelyst-v3.5.0_GH0.tar.gz) = 351578d495213c438365f988a70bb8f8c14b1d7dcef79ce0f723dd584388aa77 -SIZE (cutelyst-cutelyst-v3.5.0_GH0.tar.gz) = 481812 +TIMESTAMP = 1669411904 +SHA256 (cutelyst-cutelyst-v3.7.0_GH0.tar.gz) = 3d3589817d813657fbdafc0c299618b1ba6aebec5c954c9c921e173e179bbea2 +SIZE (cutelyst-cutelyst-v3.7.0_GH0.tar.gz) = 482108 diff --git a/www/cutelyst/files/patch-CMakeLists.txt b/www/cutelyst/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..0d8a58fb2c2c --- /dev/null +++ b/www/cutelyst/files/patch-CMakeLists.txt @@ -0,0 +1,20 @@ +--- CMakeLists.txt.orig 2022-11-27 12:59:53 UTC ++++ CMakeLists.txt +@@ -160,7 +160,7 @@ if(UNIX AND NOT (APPLE OR HAIKU)) + set(LINUX TRUE) + endif() + +-if (LINUX) ++if (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + # FreeBSD isn't Linux, but it gets claimed as Linux, because it is + # UNIX and not APPLE (see just above). +@@ -179,7 +179,7 @@ if (LINUX) + 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) ++ add_subdirectory(EventLoopEPoll) + endif() + set(LINUX FALSE) + else() diff --git a/www/cutelyst/files/patch-Cutelyst_Plugins_View_Grantlee_grantleeview.cpp b/www/cutelyst/files/patch-Cutelyst_Plugins_View_Grantlee_grantleeview.cpp deleted file mode 100644 index 7d126fb9f246..000000000000 --- a/www/cutelyst/files/patch-Cutelyst_Plugins_View_Grantlee_grantleeview.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- Cutelyst/Plugins/View/Grantlee/grantleeview.cpp.orig 2021-06-17 11:59:52 UTC -+++ Cutelyst/Plugins/View/Grantlee/grantleeview.cpp -@@ -23,6 +23,7 @@ - #include "response.h" - #include "config.h" - -+#include - #include - - #include diff --git a/www/cutelyst/files/patch-EventLoopEPoll_CMakeLists.txt b/www/cutelyst/files/patch-EventLoopEPoll_CMakeLists.txt new file mode 100644 index 000000000000..bf69a833d8fa --- /dev/null +++ b/www/cutelyst/files/patch-EventLoopEPoll_CMakeLists.txt @@ -0,0 +1,13 @@ +--- EventLoopEPoll/CMakeLists.txt.orig 2022-11-27 13:04:21 UTC ++++ EventLoopEPoll/CMakeLists.txt +@@ -25,6 +25,10 @@ set_target_properties(Cutelyst${PROJECT_VERSION_MAJOR} + target_link_libraries(Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}EventLoopEpoll + Qt${QT_VERSION_MAJOR}::Core + ) ++if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") ++ find_package(epoll-shim REQUIRED) ++ target_link_libraries(Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}EventLoopEpoll epoll-shim::epoll-shim) ++endif() + + install(TARGETS Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}EventLoopEpoll EXPORT CutelystTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}) + diff --git a/www/cutelyst/files/patch-server_CMakeLists.txt b/www/cutelyst/files/patch-server_CMakeLists.txt new file mode 100644 index 000000000000..e6b3abfac30b --- /dev/null +++ b/www/cutelyst/files/patch-server_CMakeLists.txt @@ -0,0 +1,20 @@ +--- server/CMakeLists.txt.orig 2022-11-27 13:00:17 UTC ++++ server/CMakeLists.txt +@@ -91,7 +91,7 @@ target_link_libraries(Cutelyst${PROJECT_VERSION_MAJOR} + PRIVATE Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}::Core + ) + +-if (LINUX) ++if (TARGET Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}::EventLoopEPoll) + target_link_libraries(Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}Server + PRIVATE Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}::EventLoopEPoll + ) +@@ -130,7 +130,7 @@ target_link_libraries(cutelystd + PRIVATE Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}::Server + ) + +-if (LINUX) ++if (TARGET Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}::EventLoopEPoll) + target_link_libraries(cutelystd + PRIVATE Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}::EventLoopEPoll + ) diff --git a/www/cutelyst/pkg-plist b/www/cutelyst/pkg-plist index 78fa36f8fdcc..b42323587f37 100644 --- a/www/cutelyst/pkg-plist +++ b/www/cutelyst/pkg-plist @@ -1,208 +1,211 @@ bin/cutelyst3-qt5 bin/cutelystd3-qt5 include/cutelyst3-qt5/Cutelyst/Action include/cutelyst3-qt5/Cutelyst/ActionChain include/cutelyst3-qt5/Cutelyst/Application include/cutelyst3-qt5/Cutelyst/Component include/cutelyst3-qt5/Cutelyst/Context include/cutelyst3-qt5/Cutelyst/Controller include/cutelyst3-qt5/Cutelyst/DispatchType include/cutelyst3-qt5/Cutelyst/Dispatcher include/cutelyst3-qt5/Cutelyst/Engine include/cutelyst3-qt5/Cutelyst/Headers include/cutelyst3-qt5/Cutelyst/ParamsMultiMap include/cutelyst3-qt5/Cutelyst/Plugin include/cutelyst3-qt5/Cutelyst/Plugins/Authentication/authentication.h include/cutelyst3-qt5/Cutelyst/Plugins/Authentication/authenticationrealm.h include/cutelyst3-qt5/Cutelyst/Plugins/Authentication/authenticationstore.h include/cutelyst3-qt5/Cutelyst/Plugins/Authentication/authenticationuser.h include/cutelyst3-qt5/Cutelyst/Plugins/Authentication/credentialhttp.h include/cutelyst3-qt5/Cutelyst/Plugins/Authentication/credentialpassword.h include/cutelyst3-qt5/Cutelyst/Plugins/Authentication/htpasswd.h include/cutelyst3-qt5/Cutelyst/Plugins/Authentication/minimal.h include/cutelyst3-qt5/Cutelyst/Plugins/CSRFProtection/CSRFProtection include/cutelyst3-qt5/Cutelyst/Plugins/CSRFProtection/csrfprotection.h include/cutelyst3-qt5/Cutelyst/Plugins/Session/Session include/cutelyst3-qt5/Cutelyst/Plugins/Session/session.h include/cutelyst3-qt5/Cutelyst/Plugins/Session/sessionstorefile.h include/cutelyst3-qt5/Cutelyst/Plugins/StaticCompressed/StaticCompressed include/cutelyst3-qt5/Cutelyst/Plugins/StaticCompressed/staticcompressed.h include/cutelyst3-qt5/Cutelyst/Plugins/StaticSimple/StaticSimple include/cutelyst3-qt5/Cutelyst/Plugins/StaticSimple/staticsimple.h include/cutelyst3-qt5/Cutelyst/Plugins/StatusMessage include/cutelyst3-qt5/Cutelyst/Plugins/UserAgent include/cutelyst3-qt5/Cutelyst/Plugins/useragent.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/LangSelect include/cutelyst3-qt5/Cutelyst/Plugins/Utils/Pagination include/cutelyst3-qt5/Cutelyst/Plugins/Utils/Sql include/cutelyst3-qt5/Cutelyst/Plugins/Utils/Validator include/cutelyst3-qt5/Cutelyst/Plugins/Utils/ValidatorResult include/cutelyst3-qt5/Cutelyst/Plugins/Utils/ValidatorRule include/cutelyst3-qt5/Cutelyst/Plugins/Utils/Validators include/cutelyst3-qt5/Cutelyst/Plugins/Utils/langselect.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/pagination.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/sql.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validator.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatoraccepted.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorafter.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatoralpha.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatoralphadash.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatoralphanum.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorbefore.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorbetween.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorboolean.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorcharnotallowed.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorconfirmed.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatordate.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatordatetime.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatordifferent.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatordigits.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatordigitsbetween.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatordomain.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatoremail.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorfilesize.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorfilled.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorin.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorinteger.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorip.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorjson.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatormax.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatormin.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatornotin.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatornumeric.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorpresent.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorregularexpression.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorrequired.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorrequiredif.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorrequiredifstash.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorrequiredunless.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorrequiredunlessstash.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorrequiredwith.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorrequiredwithall.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorrequiredwithout.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorrequiredwithoutall.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorresult.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorrule.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorsame.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorsize.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatortime.h include/cutelyst3-qt5/Cutelyst/Plugins/Utils/validatorurl.h include/cutelyst3-qt5/Cutelyst/Plugins/View/JSON/viewjson.h include/cutelyst3-qt5/Cutelyst/Plugins/statusmessage.h include/cutelyst3-qt5/Cutelyst/Request include/cutelyst3-qt5/Cutelyst/Response include/cutelyst3-qt5/Cutelyst/Server/server.h include/cutelyst3-qt5/Cutelyst/Upload include/cutelyst3-qt5/Cutelyst/View include/cutelyst3-qt5/Cutelyst/action.h include/cutelyst3-qt5/Cutelyst/actionchain.h include/cutelyst3-qt5/Cutelyst/application.h include/cutelyst3-qt5/Cutelyst/async.h include/cutelyst3-qt5/Cutelyst/component.h include/cutelyst3-qt5/Cutelyst/componentfactory.h include/cutelyst3-qt5/Cutelyst/context.h include/cutelyst3-qt5/Cutelyst/controller.h include/cutelyst3-qt5/Cutelyst/cutelyst_global.h include/cutelyst3-qt5/Cutelyst/dispatcher.h include/cutelyst3-qt5/Cutelyst/dispatchtype.h include/cutelyst3-qt5/Cutelyst/engine.h include/cutelyst3-qt5/Cutelyst/enginerequest.h include/cutelyst3-qt5/Cutelyst/headers.h include/cutelyst3-qt5/Cutelyst/paramsmultimap.h include/cutelyst3-qt5/Cutelyst/plugin.h include/cutelyst3-qt5/Cutelyst/request.h include/cutelyst3-qt5/Cutelyst/response.h include/cutelyst3-qt5/Cutelyst/stats.h include/cutelyst3-qt5/Cutelyst/upload.h include/cutelyst3-qt5/Cutelyst/utils.h include/cutelyst3-qt5/Cutelyst/view.h include/cutelyst3-qt5/Cutelyst/view_p.h lib/cmake/Cutelyst3Qt5/Cutelyst3Qt5Config.cmake lib/cmake/Cutelyst3Qt5/Cutelyst3Qt5ConfigVersion.cmake lib/cmake/Cutelyst3Qt5/Cutelyst3Qt5Targets-release.cmake lib/cmake/Cutelyst3Qt5/Cutelyst3Qt5Targets.cmake lib/cutelyst3-qt5-plugins/libActionREST.so lib/cutelyst3-qt5-plugins/libActionRenderView.so lib/cutelyst3-qt5-plugins/libActionRoleACL.so lib/libCutelyst3Qt5.so lib/libCutelyst3Qt5.so.3 lib/libCutelyst3Qt5.so.%%SOVER%% lib/libCutelyst3Qt5Authentication.so lib/libCutelyst3Qt5Authentication.so.3 lib/libCutelyst3Qt5Authentication.so.%%SOVER%% lib/libCutelyst3Qt5CSRFProtection.so lib/libCutelyst3Qt5CSRFProtection.so.3 lib/libCutelyst3Qt5CSRFProtection.so.%%SOVER%% +lib/libCutelyst3Qt5EventLoopEpoll.so +lib/libCutelyst3Qt5EventLoopEpoll.so.3 +lib/libCutelyst3Qt5EventLoopEpoll.so.%%SOVER%% lib/libCutelyst3Qt5Server.so lib/libCutelyst3Qt5Server.so.3 lib/libCutelyst3Qt5Server.so.%%SOVER%% lib/libCutelyst3Qt5Session.so lib/libCutelyst3Qt5Session.so.3 lib/libCutelyst3Qt5Session.so.%%SOVER%% lib/libCutelyst3Qt5StaticCompressed.so lib/libCutelyst3Qt5StaticCompressed.so.3 lib/libCutelyst3Qt5StaticCompressed.so.%%SOVER%% lib/libCutelyst3Qt5StaticSimple.so lib/libCutelyst3Qt5StaticSimple.so.3 lib/libCutelyst3Qt5StaticSimple.so.%%SOVER%% lib/libCutelyst3Qt5StatusMessage.so lib/libCutelyst3Qt5StatusMessage.so.3 lib/libCutelyst3Qt5StatusMessage.so.%%SOVER%% lib/libCutelyst3Qt5UserAgent.so lib/libCutelyst3Qt5UserAgent.so.3 lib/libCutelyst3Qt5UserAgent.so.%%SOVER%% lib/libCutelyst3Qt5UtilsLangSelect.so lib/libCutelyst3Qt5UtilsLangSelect.so.3 lib/libCutelyst3Qt5UtilsLangSelect.so.%%SOVER%% lib/libCutelyst3Qt5UtilsPagination.so lib/libCutelyst3Qt5UtilsPagination.so.3 lib/libCutelyst3Qt5UtilsPagination.so.%%SOVER%% lib/libCutelyst3Qt5UtilsSql.so lib/libCutelyst3Qt5UtilsSql.so.3 lib/libCutelyst3Qt5UtilsSql.so.%%SOVER%% lib/libCutelyst3Qt5UtilsValidator.so lib/libCutelyst3Qt5UtilsValidator.so.3 lib/libCutelyst3Qt5UtilsValidator.so.%%SOVER%% lib/libCutelyst3Qt5ViewJson.so lib/libCutelyst3Qt5ViewJson.so.3 lib/libCutelyst3Qt5ViewJson.so.%%SOVER%% libdata/pkgconfig/Cutelyst3Qt5Authentication.pc libdata/pkgconfig/Cutelyst3Qt5CSRFProtection.pc libdata/pkgconfig/Cutelyst3Qt5Core.pc libdata/pkgconfig/Cutelyst3Qt5Server.pc libdata/pkgconfig/Cutelyst3Qt5Session.pc libdata/pkgconfig/Cutelyst3Qt5StaticCompressed.pc libdata/pkgconfig/Cutelyst3Qt5StaticSimple.pc libdata/pkgconfig/Cutelyst3Qt5StatusMessage.pc libdata/pkgconfig/Cutelyst3Qt5UserAgent.pc libdata/pkgconfig/Cutelyst3Qt5UtilsLangSelect.pc libdata/pkgconfig/Cutelyst3Qt5UtilsPagination.pc libdata/pkgconfig/Cutelyst3Qt5UtilsSql.pc libdata/pkgconfig/Cutelyst3Qt5UtilsValidator.pc libdata/pkgconfig/Cutelyst3Qt5ViewJSON.pc share/man/man1/cutelyst3-qt5.1.gz share/man/man1/cutelystd3-qt5.1.gz share/man/man5/Cutelyst3Qt5CSRFProtection.5.gz share/man/man5/Cutelyst3Qt5Session.5.gz %%DATADIR%%3/translations/cutelystcmd.de.qm %%DATADIR%%3/translations/cutelystcore.de.qm %%DATADIR%%3/translations/cutelystwsgi.de.qm %%DATADIR%%3/translations/cutelystcmd.en.qm %%DATADIR%%3/translations/cutelystcore.en.qm %%DATADIR%%3/translations/cutelystwsgi.en.qm %%DATADIR%%3/translations/plugin_csrfprotection.de.qm %%DATADIR%%3/translations/plugin_csrfprotection.en.qm %%DATADIR%%3/translations/plugin_memcached.de.qm %%DATADIR%%3/translations/plugin_memcached.en.qm %%DATADIR%%3/translations/plugin_utils_validator.de.qm %%DATADIR%%3/translations/plugin_utils_validator.en.qm %%DATADIR%%3/translations/plugin_view_cutelee.de.qm %%DATADIR%%3/translations/plugin_view_cutelee.en.qm %%DATADIR%%3/translations/plugin_view_grantlee.de.qm %%DATADIR%%3/translations/plugin_view_grantlee.en.qm %%GRANTLEE%%include/cutelyst3-qt5/Cutelyst/Plugins/View/Grantlee/grantleeview.h %%GRANTLEE%%lib/cutelyst3-qt5-plugins/grantlee/%%GRANTLEE_VERSION_SHORT%%/grantlee_cutelyst.so %%GRANTLEE%%lib/libCutelyst3Qt5ViewGrantlee.so %%GRANTLEE%%lib/libCutelyst3Qt5ViewGrantlee.so.3 %%GRANTLEE%%lib/libCutelyst3Qt5ViewGrantlee.so.%%SOVER%% %%GRANTLEE%%libdata/pkgconfig/Cutelyst3Qt5Grantlee.pc