diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
index 4e7f016f2ac5..f6486072cfa1 100644
--- a/print/lilypond-devel/Makefile
+++ b/print/lilypond-devel/Makefile
@@ -1,96 +1,94 @@
 # Created by: patrick, trevor
 
 PORTNAME=	lilypond
-DISTVERSION=	2.23.2
-PORTREVISION=	1
+DISTVERSION=	2.23.3
 CATEGORIES=	print audio
 MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	m.ne@gmx.net
 COMMENT=	GNU music typesetter
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	bash:shells/bash \
 		convert:graphics/ImageMagick6 \
 		dblatex:textproc/dblatex \
 		fontforge:print/fontforge \
 		help2man:misc/help2man \
 		pdftexi2dvi:print/texinfo \
 		pngtopnm:graphics/netpbm \
 		rsync:net/rsync \
 		t1ascii:print/t1utils \
 		texi2html:textproc/texi2html \
 		zip:archivers/zip
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgmp.so:math/gmp \
+		libharfbuzz.so:print/harfbuzz \
 		libltdl.so:devel/libltdl
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \
 		mftrace:print/mftrace
 
 USES=		bison:build compiler:c++11-lib ghostscript gmake gnome perl5 \
 		pkgconfig python:3.5+
 USE_CXXSTD=	c++11
 USE_GNOME=	pango
 USE_PERL5=	build
 USE_TEX=	latex texmf
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre
 CONFIGURE_ENV+=		ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
 			FLEX=${FLEX} \
 			HOME=${WRKDIR} \
 			YACC=${YACC}
 
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	all
 
 BINARY_ALIAS=	python=${PYTHON_VERSION}
 
 INFO=		lilypond-changes \
 		lilypond-contributor \
 		lilypond-essay \
 		lilypond-extending \
 		lilypond-internals \
 		lilypond-learning \
 		lilypond-notation \
 		lilypond-snippets \
 		lilypond-usage \
 		music-glossary
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 OPTIONS_DEFINE=	GUILE2 NLS URW
 OPTIONS_SUB=	yes
 
 GUILE2_DESC=	Use guile2 (will incur some performance penalty)
 URW_DESC=	Use bundled URW fonts
 
 GUILE2_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded \
 			libguile-2.2.so:lang/guile2
 GUILE2_LIB_DEPENDS_OFF=	libguile.so:lang/guile1
 
 NLS_USES=	gettext
 
 URW_BUILD_DEPENDS=	urw-base35-fonts>0:x11-fonts/urw-base35-fonts
 URW_RUN_DEPENDS_OFF=	urw-base35-fonts>0:x11-fonts/urw-base35-fonts
 
 URW_CONFIGURE_WITH=	urwotf-dir=${LOCALBASE}/share/fonts/urw-base35-fonts
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|<FlexLexer.h>|"/usr/include/FlexLexer.h"|' \
 		${WRKSRC}/lily/include/includable-lexer.hh
-	@${REINPLACE_CMD} -e 's|$save_CXXFLAGS -Werror=suggest-override|$save_CXXFLAGS|' \
-		${WRKSRC}/configure
 	@${SED} -e 's|%%FONTDIR%%|${WRKDIR}/fontconfig/cache/|'  \
 		${FILESDIR}/fonts.conf > ${WRKDIR}/.fonts.conf
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e '/po \\$$/d' ${WRKSRC}/${MAKEFILE}.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilypond
 	(cd ${STAGEDIR}/${DATADIR} && ${LN} -fs ${DISTVERSION} current)
 
 .include <bsd.port.mk>
diff --git a/print/lilypond-devel/distinfo b/print/lilypond-devel/distinfo
index 7befaa7ebb33..d855dc0ff877 100644
--- a/print/lilypond-devel/distinfo
+++ b/print/lilypond-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618420280
-SHA256 (lilypond-2.23.2.tar.gz) = 3b850b7af0322db720eafe8141f4a3e275fee6e00325da85decffbdb6ffced8c
-SIZE (lilypond-2.23.2.tar.gz) = 17080861
+TIMESTAMP = 1625529967
+SHA256 (lilypond-2.23.3.tar.gz) = 8a833696f7c6d2d4b4ae162ffd0836216c63c3765ea14069d6632d320d6bc308
+SIZE (lilypond-2.23.3.tar.gz) = 17109789
diff --git a/print/lilypond-devel/files/patch-Documentation_GNUmakefile b/print/lilypond-devel/files/patch-Documentation_GNUmakefile
index df8dba5740ee..bd69aeb82a41 100644
--- a/print/lilypond-devel/files/patch-Documentation_GNUmakefile
+++ b/print/lilypond-devel/files/patch-Documentation_GNUmakefile
@@ -1,23 +1,23 @@
---- Documentation/GNUmakefile.orig	2020-08-16 10:58:56 UTC
+--- Documentation/GNUmakefile.orig	2021-07-03 16:12:20 UTC
 +++ Documentation/GNUmakefile
-@@ -147,6 +147,7 @@ INFO_DOCS = \
+@@ -187,6 +187,7 @@ INFO_DOCS = \
    lilypond-internals \
    lilypond-learning \
    lilypond-notation \
 +  lilypond-snippets \
    lilypond-usage \
    music-glossary
- # Some info files should only be processed if `$(out)` is equal to
-@@ -156,11 +157,9 @@ INFO_DOCS = \
- # more entries that are no longer present.
+ # Some info files should only be processed if `$(out)` is equal to `www`, but we
+@@ -195,11 +196,9 @@ INFO_DOCS = \
+ # older LilyPond versions inserted more entries that are no longer present.
  ALL_INFO_DOCS = \
    $(INFO_DOCS) \
 -  lilypond-snippets \
    lilypond-web
  ifeq ($(out),www)
--INFO_DOCS += lilypond-snippets \
--             lilypond-web
-+INFO_DOCS += lilypond-web
+-  INFO_DOCS += lilypond-snippets \
+-               lilypond-web
++  INFO_DOCS += lilypond-web
  endif
  INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
  ALL_INFO_FILES = $(ALL_INFO_DOCS:%=$(outdir)/%.info)