svn commit: r559840 - in head: databases/cutelyst-asql www/cutelyst

[Adriaan de Groot]

Author: adridg
Date: Fri Jan  1 15:35:49 2021
New Revision: 559840
URL: https://svnweb.freebsd.org/changeset/ports/559840

Log:
  Update www/cutelyst and databases/cutelyst-asql to latest upstream release
  
  Cutelyst is a Qt5-based web application framework. It gives you C++
  for application logic and WSGI server and plugins for the webby bits.
  
  This update adds a GRANTLEE option, enabled by default: it turns out
  I hadn't enabled **any** templating in Cutelyst, which is a bit
  of an annoying restriction. Grantlee is a Qt5-only templating
  engine, so the additional default dependencies are fairly light.
  
  While here, simplify some of the CMake options handling;
  one thing I'm not sure about is how OPTIONs should be handled
  in the ordering of pkg-plist: the Porter's Handbook section 8.1
  does not offer any guidance. I've collected them at the end.
  
  Reported by:	portscout

Modified:
  head/databases/cutelyst-asql/Makefile
  head/databases/cutelyst-asql/distinfo
  head/www/cutelyst/Makefile
  head/www/cutelyst/distinfo
  head/www/cutelyst/pkg-plist

Modified: head/databases/cutelyst-asql/Makefile
==============================================================================
--- head/databases/cutelyst-asql/Makefile	Fri Jan  1 15:30:07 2021	(r559839)
+++ head/databases/cutelyst-asql/Makefile	Fri Jan  1 15:35:49 2021	(r559840)
@@ -2,7 +2,7 @@
 
 PORTNAME=	asql
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.19.0
+DISTVERSION=	0.26.0
 CATEGORIES=	databases
 PKGNAMEPREFIX=	cutelyst-
 

Modified: head/databases/cutelyst-asql/distinfo
==============================================================================
--- head/databases/cutelyst-asql/distinfo	Fri Jan  1 15:30:07 2021	(r559839)
+++ head/databases/cutelyst-asql/distinfo	Fri Jan  1 15:35:49 2021	(r559840)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603716850
-SHA256 (cutelyst-asql-v0.19.0_GH0.tar.gz) = f514fbefeb17a7055ede68e545f935ecce7e7acd50e2a2115f3e7f6886eb0af7
-SIZE (cutelyst-asql-v0.19.0_GH0.tar.gz) = 28477
+TIMESTAMP = 1609503064
+SHA256 (cutelyst-asql-v0.26.0_GH0.tar.gz) = ca30ace4f62e37f6644f7a56883f137d5e1341226cad347a675205e33857ce6b
+SIZE (cutelyst-asql-v0.26.0_GH0.tar.gz) = 33150

Modified: head/www/cutelyst/Makefile
==============================================================================
--- head/www/cutelyst/Makefile	Fri Jan  1 15:30:07 2021	(r559839)
+++ head/www/cutelyst/Makefile	Fri Jan  1 15:35:49 2021	(r559840)
@@ -2,7 +2,7 @@
 
 PORTNAME=	cutelyst
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.13.0
+DISTVERSION=	2.14.0
 CATEGORIES=	www
 
 MAINTAINER=	adridg at FreeBSD.org
@@ -17,11 +17,20 @@ USE_LDCONFIG=	yes
 USE_QT=		qmake_build buildtools_build linguisttools_build \
 		core network sql
 
-CMAKE_ARGS=	-DBUILD_ALL=OFF \
-		-DPLUGIN_CSRFPROTECTION=ON \
-		-DPLUGIN_STATICCOMPRESSED=ON \
-		-DBUILD_TESTS=OFF \
-		-DMANDIR:PATH=man \
+# 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=man \
 		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=TRUE
 
 PLIST_SUB=	SOVER=${DISTVERSION}

Modified: head/www/cutelyst/distinfo
==============================================================================
--- head/www/cutelyst/distinfo	Fri Jan  1 15:30:07 2021	(r559839)
+++ head/www/cutelyst/distinfo	Fri Jan  1 15:35:49 2021	(r559840)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603716565
-SHA256 (cutelyst-cutelyst-v2.13.0_GH0.tar.gz) = 07876accdd1bb393d68a774bf5e4259c563ef798236346d51726b47c6575b87a
-SIZE (cutelyst-cutelyst-v2.13.0_GH0.tar.gz) = 489439
+TIMESTAMP = 1609503082
+SHA256 (cutelyst-cutelyst-v2.14.0_GH0.tar.gz) = 73115acaa1df8574bed4333b3ee142b09f1a7abe1272c19379392c1735e85bea
+SIZE (cutelyst-cutelyst-v2.14.0_GH0.tar.gz) = 489834

Modified: head/www/cutelyst/pkg-plist
==============================================================================
--- head/www/cutelyst/pkg-plist	Fri Jan  1 15:30:07 2021	(r559839)
+++ head/www/cutelyst/pkg-plist	Fri Jan  1 15:35:49 2021	(r559840)
@@ -104,6 +104,7 @@ 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/enginerequest.h
 include/cutelyst2-qt5/Cutelyst/headers.h
 include/cutelyst2-qt5/Cutelyst/paramsmultimap.h
 include/cutelyst2-qt5/Cutelyst/plugin.h
@@ -197,3 +198,10 @@ man/man5/Cutelyst2Qt5Session.5.gz
 %%DATADIR%%2/translations/plugin_view_cutelee.en.qm
 %%DATADIR%%2/translations/plugin_view_grantlee.de.qm
 %%DATADIR%%2/translations/plugin_view_grantlee.en.qm
+
+%%GRANTLEE%%include/cutelyst2-qt5/Cutelyst/Plugins/View/Grantlee/grantleeview.h
+%%GRANTLEE%%lib/cutelyst2-plugins/grantlee/%%GRANTLEE_VERSION_SHORT%%/grantlee_cutelyst.so
+%%GRANTLEE%%lib/libCutelyst2Qt5ViewGrantlee.so
+%%GRANTLEE%%lib/libCutelyst2Qt5ViewGrantlee.so.2
+%%GRANTLEE%%lib/libCutelyst2Qt5ViewGrantlee.so.%%SOVER%%
+%%GRANTLEE%%libdata/pkgconfig/Cutelyst2Qt5Grantlee.pc