Index: head/www/cutelyst/Makefile =================================================================== --- head/www/cutelyst/Makefile (revision 493358) +++ head/www/cutelyst/Makefile (revision 493359) @@ -1,25 +1,27 @@ # $FreeBSD$ PORTNAME= cutelyst DISTVERSIONPREFIX= v -DISTVERSION= 2.4.0 -PORTREVISION= 1 +DISTVERSION= 2.7.0 CATEGORIES= www MAINTAINER= adridg@FreeBSD.org COMMENT= C++/Qt web framework LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING USES= cmake localbase qt:5 USE_GITHUB= yes USE_LDCONFIG= yes USE_QT= qmake_build buildtools_build \ core network sql + CMAKE_ARGS= -DBUILD_ALL=OFF \ -DBUILD_TESTS=OFF \ -DMANDIR:PATH=man \ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=TRUE + +PLIST_SUB= SOVER=${DISTVERSION} .include Index: head/www/cutelyst/distinfo =================================================================== --- head/www/cutelyst/distinfo (revision 493358) +++ head/www/cutelyst/distinfo (revision 493359) @@ -1,3 +1,3 @@ -TIMESTAMP = 1527770048 -SHA256 (cutelyst-cutelyst-v2.4.0_GH0.tar.gz) = 85680f5a7d21ad49475067addb06a10c9902597df6ab697b1a92eeb2683cb85d -SIZE (cutelyst-cutelyst-v2.4.0_GH0.tar.gz) = 449452 +TIMESTAMP = 1550569411 +SHA256 (cutelyst-cutelyst-v2.7.0_GH0.tar.gz) = f87c2f04b148a50f5df13aa5d75b45bf20e56be2e2cd6e17c2aef5231db4b467 +SIZE (cutelyst-cutelyst-v2.7.0_GH0.tar.gz) = 459601 Index: head/www/cutelyst/files/patch-CMakeLists.txt =================================================================== --- head/www/cutelyst/files/patch-CMakeLists.txt (revision 493358) +++ head/www/cutelyst/files/patch-CMakeLists.txt (revision 493359) @@ -1,34 +1,38 @@ 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 2018-05-29 15:08:25 UTC +--- CMakeLists.txt.orig 2019-02-15 20:30:30 UTC +++ CMakeLists.txt -@@ -161,10 +161,26 @@ install(EXPORT CutelystTargets - add_subdirectory(Cutelyst) - - if(UNIX AND NOT APPLE) -- set(LINUX TRUE) -+ # set(LINUX TRUE) -+ set(LINUX FALSE) # FreeBSD isn't Linux +@@ -166,7 +166,30 @@ if(UNIX AND NOT (APPLE OR HAIKU)) endif() if (LINUX) -+ # 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 switch off EPoll anyway. -+ 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) ++ 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() -+ - add_subdirectory(EventLoopEPoll) endif() + add_subdirectory(wsgi) Index: head/www/cutelyst/pkg-plist =================================================================== --- head/www/cutelyst/pkg-plist (revision 493358) +++ head/www/cutelyst/pkg-plist (revision 493359) @@ -1,161 +1,167 @@ bin/cutelyst-wsgi2 bin/cutelyst2 include/cutelyst2-qt5/Cutelyst/Action include/cutelyst2-qt5/Cutelyst/Application include/cutelyst2-qt5/Cutelyst/Component include/cutelyst2-qt5/Cutelyst/Context include/cutelyst2-qt5/Cutelyst/Controller include/cutelyst2-qt5/Cutelyst/DispatchType include/cutelyst2-qt5/Cutelyst/Dispatcher include/cutelyst2-qt5/Cutelyst/Engine include/cutelyst2-qt5/Cutelyst/Headers include/cutelyst2-qt5/Cutelyst/ParamsMultiMap include/cutelyst2-qt5/Cutelyst/Plugin include/cutelyst2-qt5/Cutelyst/Plugins/Authentication/authentication.h include/cutelyst2-qt5/Cutelyst/Plugins/Authentication/authenticationrealm.h include/cutelyst2-qt5/Cutelyst/Plugins/Authentication/authenticationstore.h include/cutelyst2-qt5/Cutelyst/Plugins/Authentication/authenticationuser.h include/cutelyst2-qt5/Cutelyst/Plugins/Authentication/credentialhttp.h include/cutelyst2-qt5/Cutelyst/Plugins/Authentication/credentialpassword.h include/cutelyst2-qt5/Cutelyst/Plugins/Authentication/htpasswd.h include/cutelyst2-qt5/Cutelyst/Plugins/Authentication/minimal.h include/cutelyst2-qt5/Cutelyst/Plugins/Session/Session include/cutelyst2-qt5/Cutelyst/Plugins/Session/session.h include/cutelyst2-qt5/Cutelyst/Plugins/Session/sessionstorefile.h include/cutelyst2-qt5/Cutelyst/Plugins/StaticSimple/StaticSimple include/cutelyst2-qt5/Cutelyst/Plugins/StaticSimple/staticsimple.h include/cutelyst2-qt5/Cutelyst/Plugins/StatusMessage +include/cutelyst2-qt5/Cutelyst/Plugins/UserAgent +include/cutelyst2-qt5/Cutelyst/Plugins/useragent.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/LangSelect include/cutelyst2-qt5/Cutelyst/Plugins/Utils/Pagination include/cutelyst2-qt5/Cutelyst/Plugins/Utils/Sql include/cutelyst2-qt5/Cutelyst/Plugins/Utils/Validator include/cutelyst2-qt5/Cutelyst/Plugins/Utils/ValidatorResult include/cutelyst2-qt5/Cutelyst/Plugins/Utils/ValidatorRule include/cutelyst2-qt5/Cutelyst/Plugins/Utils/Validators include/cutelyst2-qt5/Cutelyst/Plugins/Utils/langselect.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/pagination.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/sql.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validator.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatoraccepted.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorafter.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatoralpha.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatoralphadash.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatoralphanum.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorbefore.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorbetween.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorboolean.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorconfirmed.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatordate.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatordatetime.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatordifferent.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatordigits.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatordigitsbetween.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatordomain.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatoremail.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorfilesize.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorfilled.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorin.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorinteger.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorip.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorjson.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatormax.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatormin.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatornotin.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatornumeric.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorpresent.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorregularexpression.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorrequired.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorrequiredif.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorrequiredifstash.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorrequiredunless.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorrequiredunlessstash.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorrequiredwith.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorrequiredwithall.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorrequiredwithout.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorrequiredwithoutall.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorresult.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorrule.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorsame.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorsize.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatortime.h include/cutelyst2-qt5/Cutelyst/Plugins/Utils/validatorurl.h include/cutelyst2-qt5/Cutelyst/Plugins/View/JSON/viewjson.h include/cutelyst2-qt5/Cutelyst/Plugins/statusmessage.h include/cutelyst2-qt5/Cutelyst/Request include/cutelyst2-qt5/Cutelyst/Response 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/application.h include/cutelyst2-qt5/Cutelyst/component.h include/cutelyst2-qt5/Cutelyst/componentfactory.h include/cutelyst2-qt5/Cutelyst/context.h include/cutelyst2-qt5/Cutelyst/controller.h include/cutelyst2-qt5/Cutelyst/cutelyst_global.h include/cutelyst2-qt5/Cutelyst/dispatcher.h include/cutelyst2-qt5/Cutelyst/dispatchtype.h include/cutelyst2-qt5/Cutelyst/engine.h include/cutelyst2-qt5/Cutelyst/headers.h include/cutelyst2-qt5/Cutelyst/paramsmultimap.h include/cutelyst2-qt5/Cutelyst/plugin.h include/cutelyst2-qt5/Cutelyst/request.h include/cutelyst2-qt5/Cutelyst/response.h include/cutelyst2-qt5/Cutelyst/stats.h include/cutelyst2-qt5/Cutelyst/upload.h include/cutelyst2-qt5/Cutelyst/utils.h include/cutelyst2-qt5/Cutelyst/view.h lib/cmake/Cutelyst2Qt5/Cutelyst2Qt5Config.cmake lib/cmake/Cutelyst2Qt5/Cutelyst2Qt5ConfigVersion.cmake lib/cmake/Cutelyst2Qt5/Cutelyst2Qt5Targets-release.cmake lib/cmake/Cutelyst2Qt5/Cutelyst2Qt5Targets.cmake lib/cutelyst2-plugins/libActionREST.so lib/cutelyst2-plugins/libActionRenderView.so lib/cutelyst2-plugins/libActionRoleACL.so lib/libCutelyst2Qt5.so lib/libCutelyst2Qt5.so.2 -lib/libCutelyst2Qt5.so.2.4.0 +lib/libCutelyst2Qt5.so.%%SOVER%% lib/libCutelyst2Qt5Authentication.so lib/libCutelyst2Qt5Authentication.so.2 -lib/libCutelyst2Qt5Authentication.so.2.4.0 +lib/libCutelyst2Qt5Authentication.so.%%SOVER%% lib/libCutelyst2Qt5Session.so lib/libCutelyst2Qt5Session.so.2 -lib/libCutelyst2Qt5Session.so.2.4.0 +lib/libCutelyst2Qt5Session.so.%%SOVER%% lib/libCutelyst2Qt5StaticSimple.so lib/libCutelyst2Qt5StaticSimple.so.2 -lib/libCutelyst2Qt5StaticSimple.so.2.4.0 +lib/libCutelyst2Qt5StaticSimple.so.%%SOVER%% lib/libCutelyst2Qt5StatusMessage.so lib/libCutelyst2Qt5StatusMessage.so.2 -lib/libCutelyst2Qt5StatusMessage.so.2.4.0 +lib/libCutelyst2Qt5StatusMessage.so.%%SOVER%% +lib/libCutelyst2Qt5UserAgent.so +lib/libCutelyst2Qt5UserAgent.so.2 +lib/libCutelyst2Qt5UserAgent.so.%%SOVER%% lib/libCutelyst2Qt5UtilsLangSelect.so lib/libCutelyst2Qt5UtilsLangSelect.so.2 -lib/libCutelyst2Qt5UtilsLangSelect.so.2.4.0 +lib/libCutelyst2Qt5UtilsLangSelect.so.%%SOVER%% lib/libCutelyst2Qt5UtilsPagination.so lib/libCutelyst2Qt5UtilsPagination.so.2 -lib/libCutelyst2Qt5UtilsPagination.so.2.4.0 +lib/libCutelyst2Qt5UtilsPagination.so.%%SOVER%% lib/libCutelyst2Qt5UtilsSql.so lib/libCutelyst2Qt5UtilsSql.so.2 -lib/libCutelyst2Qt5UtilsSql.so.2.4.0 +lib/libCutelyst2Qt5UtilsSql.so.%%SOVER%% lib/libCutelyst2Qt5UtilsValidator.so lib/libCutelyst2Qt5UtilsValidator.so.2 -lib/libCutelyst2Qt5UtilsValidator.so.2.4.0 +lib/libCutelyst2Qt5UtilsValidator.so.%%SOVER%% lib/libCutelyst2Qt5ViewJson.so lib/libCutelyst2Qt5ViewJson.so.2 -lib/libCutelyst2Qt5ViewJson.so.2.4.0 +lib/libCutelyst2Qt5ViewJson.so.%%SOVER%% lib/libCutelyst2Qt5Wsgi.so lib/libCutelyst2Qt5Wsgi.so.2 -lib/libCutelyst2Qt5Wsgi.so.2.4.0 +lib/libCutelyst2Qt5Wsgi.so.%%SOVER%% libdata/pkgconfig/Cutelyst2Qt5Authentication.pc libdata/pkgconfig/Cutelyst2Qt5Core.pc libdata/pkgconfig/Cutelyst2Qt5Session.pc libdata/pkgconfig/Cutelyst2Qt5StaticSimple.pc libdata/pkgconfig/Cutelyst2Qt5StatusMessage.pc +libdata/pkgconfig/Cutelyst2Qt5UserAgent.pc libdata/pkgconfig/Cutelyst2Qt5UtilsLangSelect.pc libdata/pkgconfig/Cutelyst2Qt5UtilsPagination.pc libdata/pkgconfig/Cutelyst2Qt5UtilsSql.pc libdata/pkgconfig/Cutelyst2Qt5UtilsValidator.pc libdata/pkgconfig/Cutelyst2Qt5ViewJSON.pc libdata/pkgconfig/Cutelyst2Qt5WSGI.pc man/man1/cutelyst-wsgi2.1.gz man/man1/cutelyst2.1.gz man/man5/Cutelyst2Qt5Session.5.gz