diff --git a/print/py-uharfbuzz/Makefile b/print/py-uharfbuzz/Makefile
index 4abb7a2b710a..90cac49a83c1 100644
--- a/print/py-uharfbuzz/Makefile
+++ b/print/py-uharfbuzz/Makefile
@@ -1,30 +1,28 @@
 PORTNAME=	uharfbuzz
-PORTVERSION=	0.29.0
+PORTVERSION=	0.30.0
 CATEGORIES=	print python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Streamlined Cython bindings for the harfbuzz shaping engine
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		does not build: no matching function for call to 'hb_subset_repack_or_fail'
-
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 
 USES=		compiler:c++11-lang python:3.6+ zip
 USE_PYTHON=	autoplist concurrent cython distutils
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/setup.py ${WRKSRC}/src/uharfbuzz/_harfbuzz.cpp
 	@${RM} ${WRKSRC}/src/uharfbuzz/_harfbuzz.cpp
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/harfbuzz/
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/print/py-uharfbuzz/distinfo b/print/py-uharfbuzz/distinfo
index a6ada79036d3..c9d68d95d4af 100644
--- a/print/py-uharfbuzz/distinfo
+++ b/print/py-uharfbuzz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659209954
-SHA256 (uharfbuzz-0.29.0.zip) = 57342bafa7d83e01598e38c765f3d3ced9061ea0654b48723f777d571dc4c6d1
-SIZE (uharfbuzz-0.29.0.zip) = 1297681
+TIMESTAMP = 1659271192
+SHA256 (uharfbuzz-0.30.0.zip) = a2e28cced389d8ddc235234d78e8a0535e2a0b6d452dab5dbc20843b6ef08219
+SIZE (uharfbuzz-0.30.0.zip) = 1310884
diff --git a/print/py-uharfbuzz/files/patch-setup.py b/print/py-uharfbuzz/files/patch-setup.py
index eae7ea11a653..8f4eaa12ef40 100644
--- a/print/py-uharfbuzz/files/patch-setup.py
+++ b/print/py-uharfbuzz/files/patch-setup.py
@@ -1,15 +1,16 @@
---- setup.py.orig	2022-03-22 22:29:38 UTC
+--- setup.py.orig	2022-07-31 12:39:52 UTC
 +++ setup.py
-@@ -39,11 +39,9 @@ if platform.system() == 'Darwin':
+@@ -39,12 +39,9 @@ extension = Extension(
  extension = Extension(
      'uharfbuzz._harfbuzz',
      define_macros=define_macros,
 -    include_dirs=['harfbuzz/src'],
 +    include_dirs=['%%LOCALBASE%%/include/harfbuzz'],
      sources=[
          'src/uharfbuzz/_harfbuzz.pyx',
 -        'harfbuzz/src/harfbuzz.cc',
 -        'harfbuzz/src/hb-subset-repacker.cc',
+-        'harfbuzz/src/graph/gsubgpos-context.cc',
+         'src/uharfbuzz/_draw_test_funcs.cc',
      ],
      language='c++',
-     libraries=libraries,
diff --git a/print/py-uharfbuzz/files/patch-src-uharfbuzz-_harfbuzz.cpp b/print/py-uharfbuzz/files/patch-src-uharfbuzz-_harfbuzz.cpp
index f486a2cf2b4f..f60669a0747f 100644
--- a/print/py-uharfbuzz/files/patch-src-uharfbuzz-_harfbuzz.cpp
+++ b/print/py-uharfbuzz/files/patch-src-uharfbuzz-_harfbuzz.cpp
@@ -1,18 +1,12 @@
---- src/uharfbuzz/_harfbuzz.cpp.orig	2022-03-22 22:30:14 UTC
+--- src/uharfbuzz/_harfbuzz.cpp.orig	2022-07-31 12:40:22 UTC
 +++ src/uharfbuzz/_harfbuzz.cpp
-@@ -30,14 +30,12 @@
-             "-std=c++11"
-         ],
-         "include_dirs": [
--            "harfbuzz/src"
-+            "%%LOCALBASE%%/include/harfbuzz"
-         ],
-         "language": "c++",
+@@ -36,9 +36,6 @@
          "name": "uharfbuzz._harfbuzz",
          "sources": [
              "src/uharfbuzz/_harfbuzz.pyx",
 -            "harfbuzz/src/harfbuzz.cc",
--            "harfbuzz/src/hb-subset-repacker.cc"
+-            "harfbuzz/src/hb-subset-repacker.cc",
+-            "harfbuzz/src/graph/gsubgpos-context.cc",
+             "src/uharfbuzz/_draw_test_funcs.cc"
          ]
      },
-     "module_name": "uharfbuzz._harfbuzz"