Index: Mk/Uses/cargo.mk
===================================================================
--- Mk/Uses/cargo.mk
+++ Mk/Uses/cargo.mk
@@ -241,10 +241,12 @@
 		${SED} -i.dist -E ${_CARGO_GIT_PATCH_CARGOTOML} {} +
 .endif
 
-.if !target(do-configure) && ${CARGO_CONFIGURE:tl} == "yes"
+.if ${CARGO_CONFIGURE:tl} == "yes"
+_USES_configure+=	250:cargo-configure
+
 # configure hook.  Place a config file for overriding crates-io index
 # by local source directory.
-do-configure:
+cargo-configure:
 	@${MKDIR} ${WRKDIR}/.cargo
 	@${ECHO_CMD} "[source.cargo]" > ${WRKDIR}/.cargo/config
 	@${ECHO_CMD} "directory = '${CARGO_VENDOR_DIR}'" >> ${WRKDIR}/.cargo/config
Index: x11/squeekboard/Makefile
===================================================================
--- x11/squeekboard/Makefile
+++ x11/squeekboard/Makefile
@@ -73,6 +73,9 @@
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		xkbcommon-0.4.0 \
 		yaml-rust-0.4.3
+CARGO_BUILD=	no
+CARGO_INSTALL=	no
+CARGO_TEST=	no
 
 post-patch:
 # Pass USES=cargo environment to USES=meson
@@ -84,17 +87,5 @@
 		-e '/OUT_PATH=/s,=.*,=$$PWD/$$1,' \
 		${WRKSRC}/cargo*.sh
 
-post-configure:
-# Run USES=meson after USES=cargo configures vendoring
-	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} \
-		${MAKE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS})
-
-# Let USES=meson handle the rest
-do-build:
-	@${DO_MAKE_BUILD} -C${BUILD_WRKSRC} ${ALL_TARGET}
-do-install:
-	@${DO_MAKE_BUILD} -C${INSTALL_WRKSRC} ${INSTALL_TARGET}
-do-test:
-	@${DO_MAKE_BUILD} -C${TEST_WRKSRC} ${TEST_TARGET}
 
 .include <bsd.port.mk>
Index: x11/squeekboard/pkg-message
===================================================================
--- x11/squeekboard/pkg-message
+++ x11/squeekboard/pkg-message
@@ -1,4 +1,4 @@
-To uhnide the keyboard after launch run
+To unhide the keyboard after launch run
 
 $ gdbus call --session \
     --dest=sm.puri.OSK0 \