devel/cutter: Update to version 2.1.0.

Our cutter package now uses rizin instead of radare2.

OK sthen@, thanks.

devel/cutter/Makefile

@@ -1,52 +1,56 @@
-COMMENT =	RE platform powered by radare2
+COMMENT =	RE platform powered by rizin
 
-GH_ACCOUNT =	radareorg
+V =		2.1.0
+GH_ACCOUNT =	rizinorg
 GH_PROJECT =	cutter
-GH_TAGNAME =	v1.12.0
-REVISION =	1
+GH_TAGNAME =	v${V}
+
+# Requires the translations submodule. For the next release there should be a
+# proper vendored tarball and this step should not be needed.
+MASTER_SITES0 =		https://github.com/rizinorg/cutter-translations/archive/
+TRANSLATIONS_COMMIT =	97429865
+DISTFILES =		${DISTNAME}${EXTRACT_SUFX} \
+			cutter-translations-{}${TRANSLATIONS_COMMIT}.tar.gz:0 \
 
 CATEGORIES =	devel
 
 HOMEPAGE =	https://cutter.re/
 
-MAINTAINER =	Jasper Lievisse Adriaanse <jasper@openbsd.org>
-
 # GPLv3
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB}
-WANTLIB += KF5SyntaxHighlighting Qt5Core Qt5Gui Qt5Network Qt5Svg
-WANTLIB += Qt5Widgets c capstone cdt cgraph crypto gvc m ssl z
-WANTLIB += zip
+WANTLIB += ${COMPILER_LIBCXX} KF5SyntaxHighlighting Qt5Core Qt5Gui
+WANTLIB += Qt5Network Qt5Svg Qt5Widgets c cdt cgraph gvc m python3.9
+WANTLIB += rz_analysis rz_asm rz_bin rz_bp rz_config rz_cons rz_core
+WANTLIB += rz_crypto rz_debug rz_demangler rz_diff rz_egg rz_flag
+WANTLIB += rz_hash rz_il rz_io rz_lang rz_magic rz_parse rz_reg
+WANTLIB += rz_search rz_sign rz_socket rz_syscall rz_type rz_util
 
 MODULES =	devel/cmake \
 		lang/python \
 		x11/qt5
 
 BUILD_DEPENDS =	${RUN_DEPENDS}
-RUN_DEPENDS =	devel/radare2/main>=4.5.1
-LIB_DEPENDS =	archivers/libzip \
-		devel/capstone/main \
-		devel/kf5/syntax-highlighting \
+RUN_DEPENDS =	devel/rizin>=0.4.0
+LIB_DEPENDS =	devel/kf5/syntax-highlighting \
 		math/graphviz \
 		x11/qt5/qtsvg
 
-WRKSRC =	${WRKDIST}/src
-
 # XXX: Python-based plugins don't work yet, this needs
 # CUTTER_ENABLE_PYTHON_BINDINGS which requires (unported) Shiboken2.
 CONFIGURE_ARGS =-DCUTTER_ENABLE_GRAPHVIZ=ON \
 		-DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=ON \
 		-DCUTTER_ENABLE_PYTHON=ON \
 		-DCUTTER_ENABLE_CRASH_REPORTS=OFF \
-		-DCUTTER_USE_BUNDLED_RADARE2=OFF
+		-DCUTTER_USE_BUNDLED_RIZIN=OFF
 
 NO_TEST =	Yes
 
-CFLAGS +=	-I${LOCALBASE}/include/KF5
-CXXFLAGS +=	-I${LOCALBASE}/include/KF5
+post-extract:
+	mv ${WRKDIR}/cutter-translations-${TRANSLATIONS_COMMIT}*/* \
+		${WRKSRC}/src/translations
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKBUILD}/Cutter ${PREFIX}/bin/cutter
+	${INSTALL_PROGRAM} ${WRKBUILD}/cutter ${PREFIX}/bin/cutter
 
 .include <bsd.port.mk>

devel/cutter/distinfo

@@ -1,2 +1,4 @@
-SHA256 (cutter-1.12.0.tar.gz) = hoIT0uoLSim5sDybYFwrIVXEwDtic1qb03ag2ty0/hs=
-SIZE (cutter-1.12.0.tar.gz) = 2323732
+SHA256 (cutter-2.1.0.tar.gz) = YKrOrRYEwtyK+tQjlzKtENWIKrOIKOaVwPU9HhNMKlw=
+SHA256 (cutter-translations-97429865.tar.gz) = mp1Cdpwek2TfxpSWiwWZTQLqhAgTozsWympsvoDJAGk=
+SIZE (cutter-2.1.0.tar.gz) = 2732264
+SIZE (cutter-translations-97429865.tar.gz) = 595073

devel/cutter/patches/patch-src_widgets_GraphGridLayout_cpp

@@ -1,12 +0,0 @@
-Index: src/widgets/GraphGridLayout.cpp
---- src/widgets/GraphGridLayout.cpp.orig
-+++ src/widgets/GraphGridLayout.cpp
-@@ -526,7 +526,7 @@ void GraphGridLayout::calculateEdgeMainColumn(GraphGri
-     // to contain blocks above sweep line and query for nearest column which isn't blocked by a block.
- 
-     struct Event {
--        size_t blockId;
-+        ut64 blockId;
-         size_t edgeId;
-         int row;
-         enum Type {