diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe
deleted file mode 100644
index 007bdc4f9..000000000
--- a/sys-apps/groff/groff-1.20.1.recipe
+++ /dev/null
@@ -1,96 +0,0 @@
-SUMMARY="GNU troff typesetting package"
-DESCRIPTION="
-The groff (GNU troff) software is a typesetting package which reads plain text \
-mixed with formatting commands and produces formatted output.
-"
-HOMEPAGE="http://www.gnu.org/software/groff/"
-SOURCE_URI="http://ftp.gnu.org/gnu/groff/groff-1.20.1.tar.gz"
-CHECKSUM_SHA256="b645878135cb620c6c417c5601bfe96172245af12045540d7344938b4c2cd805"
-LICENSE="GNU GPL v3"
-COPYRIGHT="2003-2009 Free Software Foundation, Inc."
-REVISION="4"
-ARCHITECTURES="all"
-
-PROVIDES="
-	groff = $portVersion compat >= 1.20
-	cmd:addftinfo = $portVersion compat >= 1.20
-	cmd:afmtodit = $portVersion compat >= 1.20
-	cmd:chem = $portVersion compat >= 1.20
-	cmd:eqn = $portVersion compat >= 1.20
-	cmd:eqn2graph = $portVersion compat >= 1.20
-	cmd:gdiffmk = $portVersion compat >= 1.20
-	cmd:grap2graph = $portVersion compat >= 1.20
-	cmd:grn = $portVersion compat >= 1.20
-	cmd:grodvi = $portVersion compat >= 1.20
-	cmd:groff = $portVersion compat >= 1.20
-	cmd:groffer = $portVersion compat >= 1.20
-	cmd:grog = $portVersion compat >= 1.20
-	cmd:grolbp = $portVersion compat >= 1.20
-	cmd:grolj4 = $portVersion compat >= 1.20
-	cmd:grops = $portVersion compat >= 1.20
-	cmd:grotty = $portVersion compat >= 1.20
-	cmd:hpftodit = $portVersion compat >= 1.20
-	cmd:indxbib = $portVersion compat >= 1.20
-	cmd:lkbib = $portVersion compat >= 1.20
-	cmd:lookbib = $portVersion compat >= 1.20
-	cmd:mmroff = $portVersion compat >= 1.20
-	cmd:neqn = $portVersion compat >= 1.20
-	cmd:nroff = $portVersion compat >= 1.20
-	cmd:pdfroff = $portVersion compat >= 1.20
-	cmd:pfbtops = $portVersion compat >= 1.20
-	cmd:pic = $portVersion compat >= 1.20
-	cmd:pic2graph = $portVersion compat >= 1.20
-	cmd:post_grohtml = $portVersion compat >= 1.20
-	cmd:pre_grohtml = $portVersion compat >= 1.20
-	cmd:preconv = $portVersion compat >= 1.20
-	cmd:refer = $portVersion compat >= 1.20
-	cmd:roff2dvi = $portVersion compat >= 1.20
-	cmd:roff2html = $portVersion compat >= 1.20
-	cmd:roff2pdf = $portVersion compat >= 1.20
-	cmd:roff2ps = $portVersion compat >= 1.20
-	cmd:roff2text = $portVersion compat >= 1.20
-	cmd:roff2x = $portVersion compat >= 1.20
-	cmd:soelim = $portVersion compat >= 1.20
-	cmd:tbl = $portVersion compat >= 1.20
-	cmd:tfmtodit = $portVersion compat >= 1.20
-	cmd:troff = $portVersion compat >= 1.20
-	"
-REQUIRES="
-	haiku
-	"
-BUILD_REQUIRES="
-	"
-BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:aclocal
-	cmd:autoconf
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
-	cmd:sed
-	"
-
-
-DEPEND=""
-BUILD()
-{
-	libtoolize --force --copy --install
-	aclocal -I m4
-	autoconf
-	sed -i s@docdir='$(datadir)/doc/groff/'@docdir=$docDir/@g Ma*
-	PERLPATH="/bin/env perl" \
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-	rm $prefix/lib/charset.alias
-}
-
-TEST()
-{
-	make check
-}
diff --git a/sys-apps/groff/groff-1.22.4.recipe b/sys-apps/groff/groff-1.22.4.recipe
deleted file mode 100644
index 6c58f1428..000000000
--- a/sys-apps/groff/groff-1.22.4.recipe
+++ /dev/null
@@ -1,98 +0,0 @@
-SUMMARY="GNU troff typesetting package"
-DESCRIPTION="
-The groff (GNU troff) software is a typesetting package which reads plain text \
-mixed with formatting commands and produces formatted output.
-"
-HOMEPAGE="http://www.gnu.org/software/groff/"
-COPYRIGHT="2003-2009 Free Software Foundation, Inc."
-LICENSE="GNU GPL v3"
-REVISION="1"
-SOURCE_URI="https://ftp.gnu.org/gnu/groff/groff-$portVersion.tar.gz"
-CHECKSUM_SHA256="e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293"
-
-ARCHITECTURES="all ?x86_gcc2 ?x86"
-
-PROVIDES="
-	groff = $portVersion compat >= 1.20
-	cmd:addftinfo = $portVersion compat >= 1.20
-	cmd:afmtodit = $portVersion compat >= 1.20
-	cmd:chem = $portVersion compat >= 1.20
-	cmd:eqn = $portVersion compat >= 1.20
-	cmd:eqn2graph = $portVersion compat >= 1.20
-	cmd:gdiffmk = $portVersion compat >= 1.20
-	cmd:glilypond = $portVersion compat >= 1.22
-	cmd:gperl = $portVersion compat >= 1.22
-	cmd:gpinyin = $portVersion compat >= 1.22
-	cmd:grap2graph = $portVersion compat >= 1.20
-	cmd:grn = $portVersion compat >= 1.20
-	cmd:grodvi = $portVersion compat >= 1.20
-	cmd:groff = $portVersion compat >= 1.20
-	cmd:groffer = $portVersion compat >= 1.20
-	cmd:grog = $portVersion compat >= 1.20
-	cmd:grolbp = $portVersion compat >= 1.20
-	cmd:grolj4 = $portVersion compat >= 1.20
-	cmd:gropdf = $portVersion compat >= 1.22
-	cmd:grops = $portVersion compat >= 1.20
-	cmd:grotty = $portVersion compat >= 1.20
-	cmd:hpftodit = $portVersion compat >= 1.20
-	cmd:indxbib = $portVersion compat >= 1.20
-	cmd:lkbib = $portVersion compat >= 1.20
-	cmd:lookbib = $portVersion compat >= 1.20
-	cmd:mmroff = $portVersion compat >= 1.20
-	cmd:neqn = $portVersion compat >= 1.20
-	cmd:nroff = $portVersion compat >= 1.20
-	cmd:pdfmom = $portVersion compat >= 1.22
-	cmd:pdfroff = $portVersion compat >= 1.20
-	cmd:pfbtops = $portVersion compat >= 1.20
-	cmd:pic = $portVersion compat >= 1.20
-	cmd:pic2graph = $portVersion compat >= 1.20
-	cmd:post_grohtml = $portVersion compat >= 1.20
-	cmd:pre_grohtml = $portVersion compat >= 1.20
-	cmd:preconv = $portVersion compat >= 1.20
-	cmd:refer = $portVersion compat >= 1.20
-	cmd:roff2dvi = $portVersion compat >= 1.20
-	cmd:roff2html = $portVersion compat >= 1.20
-	cmd:roff2pdf = $portVersion compat >= 1.20
-	cmd:roff2ps = $portVersion compat >= 1.20
-	cmd:roff2text = $portVersion compat >= 1.20
-	cmd:roff2x = $portVersion compat >= 1.20
-	cmd:soelim = $portVersion compat >= 1.20
-	cmd:tbl = $portVersion compat >= 1.20
-	cmd:tfmtodit = $portVersion compat >= 1.20
-	cmd:troff = $portVersion compat >= 1.20
-	"
-REQUIRES="
-	haiku
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:bison
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
-	cmd:makeinfo
-	cmd:sed
-	"
-
-BUILD()
-{
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-	rm $prefix/lib/charset.alias
-}
-
-TEST()
-{
-	make check
-}
diff --git a/sys-apps/groff/groff-1.23.0.recipe b/sys-apps/groff/groff-1.23.0.recipe
new file mode 100644
index 000000000..b63364618
--- /dev/null
+++ b/sys-apps/groff/groff-1.23.0.recipe
@@ -0,0 +1,124 @@
+SUMMARY="GNU troff typesetting package"
+DESCRIPTION="groff (GNU roff) is a typesetting system that reads plain text input files that \
+include formatting commands to produce output in PostScript, PDF, HTML, or DVI formats or for \
+display to a terminal. Formatting commands can be low-level typesetting primitives, macros from a \
+supplied package, or user-defined macros. All three approaches can be combined.
+
+A reimplementation and extension of the typesetter from AT&T Unix, groff is present on most POSIX \
+systems owing to its long association with Unix manuals (including man pages). It and its \
+predecessor are notable for their production of several best-selling software engineering texts. \
+groff is capable of producing typographically sophisticated documents while consuming minimal \
+system resources."
+HOMEPAGE="http://www.gnu.org/software/groff/"
+COPYRIGHT="1996-2022 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
+REVISION="1"
+SOURCE_URI="https://ftp.gnu.org/gnu/groff/groff-$portVersion.tar.gz"
+CHECKSUM_SHA256="6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	groff$secondaryArchSuffix = $portVersion compat >= 1.20
+	cmd:addftinfo$commandSuffix = $portVersion compat >= 1.20
+	cmd:afmtodit$commandSuffix = $portVersion compat >= 1.20
+	cmd:chem$commandSuffix = $portVersion compat >= 1.20
+	cmd:eqn$commandSuffix = $portVersion compat >= 1.20
+	cmd:eqn2graph$commandSuffix = $portVersion compat >= 1.20
+	cmd:gdiffmk$commandSuffix = $portVersion compat >= 1.20
+	cmd:glilypond$commandSuffix = $portVersion compat >= 1.22
+	cmd:gperl$commandSuffix = $portVersion compat >= 1.22
+	cmd:gpinyin$commandSuffix = $portVersion compat >= 1.22
+	cmd:grap2graph$commandSuffix = $portVersion compat >= 1.20
+	cmd:grn$commandSuffix = $portVersion compat >= 1.20
+	cmd:grodvi$commandSuffix = $portVersion compat >= 1.20
+	cmd:groff$commandSuffix = $portVersion compat >= 1.20
+	cmd:groffer$commandSuffix = $portVersion compat >= 1.20
+	cmd:grog$commandSuffix = $portVersion compat >= 1.20
+	cmd:grolbp$commandSuffix = $portVersion compat >= 1.20
+	cmd:grolj4$commandSuffix = $portVersion compat >= 1.20
+	cmd:gropdf$commandSuffix = $portVersion compat >= 1.22
+	cmd:grops$commandSuffix = $portVersion compat >= 1.20
+	cmd:grotty$commandSuffix = $portVersion compat >= 1.20
+	cmd:hpftodit$commandSuffix = $portVersion compat >= 1.20
+	cmd:indxbib$commandSuffix = $portVersion compat >= 1.20
+	cmd:lkbib$commandSuffix = $portVersion compat >= 1.20
+	cmd:lookbib$commandSuffix = $portVersion compat >= 1.20
+	cmd:mmroff$commandSuffix = $portVersion compat >= 1.20
+	cmd:neqn$commandSuffix = $portVersion compat >= 1.20
+	cmd:nroff$commandSuffix = $portVersion compat >= 1.20
+	cmd:pdfmom$commandSuffix = $portVersion compat >= 1.22
+	cmd:pdfroff$commandSuffix = $portVersion compat >= 1.20
+	cmd:pfbtops$commandSuffix = $portVersion compat >= 1.20
+	cmd:pic$commandSuffix = $portVersion compat >= 1.20
+	cmd:pic2graph$commandSuffix = $portVersion compat >= 1.20
+	cmd:post_grohtml$commandSuffix = $portVersion compat >= 1.20
+	cmd:pre_grohtml$commandSuffix = $portVersion compat >= 1.20
+	cmd:preconv$commandSuffix = $portVersion compat >= 1.20
+	cmd:refer$commandSuffix = $portVersion compat >= 1.20
+	cmd:roff2dvi$commandSuffix = $portVersion compat >= 1.20
+	cmd:roff2html$commandSuffix = $portVersion compat >= 1.20
+	cmd:roff2pdf$commandSuffix = $portVersion compat >= 1.20
+	cmd:roff2ps$commandSuffix = $portVersion compat >= 1.20
+	cmd:roff2text$commandSuffix = $portVersion compat >= 1.20
+	cmd:roff2x$commandSuffix = $portVersion compat >= 1.20
+	cmd:soelim$commandSuffix = $portVersion compat >= 1.20
+	cmd:tbl$commandSuffix = $portVersion compat >= 1.20
+	cmd:tfmtodit$commandSuffix = $portVersion compat >= 1.20
+	cmd:troff$commandSuffix = $portVersion compat >= 1.20
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libuchardet$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libiconv$secondaryArchSuffix
+	devel:libgs$secondaryArchSuffix
+	devel:libuchardet$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:bison
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:makeinfo
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:pnmcrop
+	cmd:pnmtopng
+	cmd:pnmtops
+	cmd:psselect
+	cmd:sed
+	"
+
+BUILD()
+{
+	runConfigure --omit-dirs binDir ./configure \
+			--bindir=$commandBinDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	rm $libDir/charset.alias
+}
+
+TEST()
+{
+	make check
+}