diff --git a/MOVED b/MOVED
index 93b27785cb67..cf3cf52cf955 100644
--- a/MOVED
+++ b/MOVED
@@ -3058,3 +3058,5 @@ devel/grpc142||2024-03-20|Has expired: Please use devel/grpc instead
 www/h2o-devel|www/h2o|2024-03-23|Upstream no longer supports releases, this port is folded into www/h2o instead
 security/rubygem-metasploit-aggregator||2024-03-24|Has expired: No longer used, no longer maintained upstream
 net-p2p/tooth||2024-03-24|Has expired: Project has been renamed to Tuba. Consider porting to the new project. See https://github.com/GeopJr/Tuba
+www/tidy-devel|www/tidy-html5|2024-03-25|Has expired: no more dev at SF, replaced by www/tidy-html5
+www/tidy-lib|www/tidy-html5|2024-03-25|Has expired: no more dev at SF, replaced by www/tidy-html5
diff --git a/www/Makefile b/www/Makefile
index 9fce0bd7ad1b..f51aadd5e803 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2375,9 +2375,7 @@
     SUBDIR += thumbnail_index
     SUBDIR += thundercache
     SUBDIR += tidy
-    SUBDIR += tidy-devel
     SUBDIR += tidy-html5
-    SUBDIR += tidy-lib
     SUBDIR += tikiwiki
     SUBDIR += tinymce
     SUBDIR += tinyproxy
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
deleted file mode 100644
index e52d3814f64a..000000000000
--- a/www/tidy-devel/Makefile
+++ /dev/null
@@ -1,110 +0,0 @@
-PORTNAME?=	tidy
-DISTVERSION=	090315-cvs
-PORTREVISION=	3
-CATEGORIES=	www
-MASTER_SITES=	LOCAL/thierry
-#MASTER_SITES=	http://tidy.sourceforge.net/src/%SUBDIR%/	\
-#		http://tidy.sourceforge.net/docs/:docs
-#MASTER_SITE_SUBDIR=	. old
-PKGNAMESUFFIX?=	-devel
-
-MAINTAINER?=	thierry@FreeBSD.org
-COMMENT?=	Utility to clean up and pretty print HTML/XHTML/XML
-WWW=		https://tidy.sourceforge.net/
-
-LICENSE=	HTML_TIDY
-LICENSE_NAME=	HTML Tidy License
-LICENSE_FILE=	${WRKSRC}/htmldoc/license.html
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-DEPRECATED=	no more dev at SF, replaced by www/tidy-html5
-EXPIRATION_DATE=	2024-03-23
-
-BUILD_DEPENDS=	xsltproc:textproc/libxslt
-
-USES=		cpe tar:bzip2
-CPE_VENDOR=	htacg
-
-SLAVEDIRS=	www/tidy-lib
-WRKSRC=		${WRKDIR}/${PORTNAME}
-MAKE_JOBS_UNSAFE=	yes
-
-.if !defined(WITH_SHLIB)
-USES+=		gmake
-PLIST_SUB=	SHLIB="@comment " NSHLIB=""
-MAKE_ARGS+=	PREFIX=${STAGEDIR}${PREFIX}
-CONFLICTS=	tidy-20000804* tidy-lib
-.else
-USES+=		autoreconf libtool
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-PLIST_SUB=	SHLIB="" NSHLIB="@comment "
-CONFLICTS=	tidy-devel-[0-9]*
-.endif
-
-DESCR=		${.CURDIR}/pkg-descr
-
-BIN2STRIP=	tidy tab2space
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-. if !defined(WITH_SHLIB)
-ALL_TARGET=	all doc
-DOCFILES=	quickref.html
-. endif
-DOCFILES+=	Overview.html checked_by_tidy.gif faq.html grid.gif pending.html	\
-		release-notes.html tidy.css tidy.gif
-.endif
-
-.if defined(MAINTAINER_MODE)
-
-CVSROOT=	":pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy"
-CVS_PASSFILE=	${WRKDIR}/temp-cvs-passfile
-
-getcvs:
-	${MKDIR} ${WRKDIR}/cvs
-	${ECHO_CMD} ${CVSROOT} A > ${CVS_PASSFILE}
-	cd ${WRKDIR}/cvs &&	\
-	CVSROOT=${CVSROOT} CVS_PASSFILE=${CVS_PASSFILE} cvs -z3 co -P tidy
-
-tarball:
-	${RM} -r ${WRKDIR}/cvs/tidy/CVSROOT
-	${FIND} ${WRKDIR}/cvs -name CVS -delete
-	cd ${WRKDIR}/cvs &&	\
-	${TAR} cfj ${_DISTDIR}${DISTFILES} tidy
-
-.endif
-
-post-patch:
-	${CHMOD} a+x ${WRKSRC}/test/testxml.sh
-.if !defined(WITH_SHLIB)
-	${CP} ${WRKSRC}/build/gmake/Makefile ${WRKSRC}
-.else
-	${CP} -R -f ${WRKSRC}/build/gnuauto/* ${WRKSRC}
-. for t in testone.sh testaccessone.sh
-	${REINPLACE_CMD} -e 's|../bin/tidy|../console/tidy|'	\
-		${WRKSRC}/test/${t}
-. endfor
-.endif
-
-post-install:
-.for pgm in ${BIN2STRIP}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${pgm}
-.endfor
-
-post-install-DOCS-on:
-	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOCFILES:S|^|${WRKSRC}/htmldoc/|} ${STAGEDIR}${DOCSDIR}
-	@${ECHO_MSG} "===>   Documentation installed in ${DOCSDIR}."
-
-do-test:
-.for t in testaccess.sh testall.sh testxml.sh
-	cd ${WRKSRC}/test && ./${t}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/www/tidy-devel/distinfo b/www/tidy-devel/distinfo
deleted file mode 100644
index eab09a7f9970..000000000000
--- a/www/tidy-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (tidy-090315-cvs.tar.bz2) = 802ddfb7cdeb1799d8db7edbf2e110df900f7101a5ceea1815af5e9d0bd5db30
-SIZE (tidy-090315-cvs.tar.bz2) = 375009
diff --git a/www/tidy-devel/files/patch-build_gmake_Makefile b/www/tidy-devel/files/patch-build_gmake_Makefile
deleted file mode 100644
index 86e3364c89d7..000000000000
--- a/www/tidy-devel/files/patch-build_gmake_Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
---- build/gmake/Makefile.orig	2008-03-22 21:13:38 UTC
-+++ build/gmake/Makefile
-@@ -58,8 +58,8 @@ SHELL=/bin/sh
- PROJECT=tidy
- 
- # Installation variables.  Spaces OK, only dir create and file copy operations.
--runinst_prefix=/usr/local
--devinst_prefix=/usr/local
-+runinst_prefix=${PREFIX}
-+devinst_prefix=${PREFIX}
- 
- bininst = ${runinst_prefix}/bin
- libinst = ${devinst_prefix}/lib
-@@ -67,7 +67,7 @@ incinst = ${devinst_prefix}/include/$(PR
- maninst = ${devinst_prefix}/man
- 
- # Internal variables. - No spaces allowed: libtool chokes on spaces in directory names.
--TOPDIR = ../..
-+TOPDIR = .
- INCDIR = ${TOPDIR}/include
- APPDIR = ${TOPDIR}/console
- SRCDIR = ${TOPDIR}/src
-@@ -90,8 +90,8 @@ DOCDIR = ${TOPDIR}/htmldoc
- # CFLAGS etc..
- # For optimised builds, flags such as "-O2" should be added and -D_DEBUG=1
- # disabled.
--CC= gcc
--CFLAGS= -g -pedantic -Wall -I $(INCDIR)
-+#CC= gcc
-+CFLAGS+= -pedantic -Wall -I $(INCDIR) -fPIC
- # flags only supported with gcc 3.x
- CFLAGS += -Wunused-parameter
- 
diff --git a/www/tidy-devel/files/patch-build_gnuauto_configure.in b/www/tidy-devel/files/patch-build_gnuauto_configure.in
deleted file mode 100644
index 2898c512e4ba..000000000000
--- a/www/tidy-devel/files/patch-build_gnuauto_configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/gnuauto/configure.in.orig	2008-03-24 21:08:16 UTC
-+++ build/gnuauto/configure.in
-@@ -72,7 +72,7 @@ AC_ARG_ENABLE(debug,[  --enable-debug   
- if test $debug_build = yes; then
- 	CFLAGS="$save_cflags -g"
- else
--	CFLAGS="-O2 $save_cflags"
-+	CFLAGS="$save_cflags"
- fi
- # 
- # =============================================
diff --git a/www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am b/www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am
deleted file mode 100644
index 2b3d31827735..000000000000
--- a/www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
---- build/gnuauto/include/Makefile.am.orig	2006-10-06 09:25:13 UTC
-+++ build/gnuauto/include/Makefile.am
-@@ -53,8 +53,8 @@
- #  acknowledgment is not required but would be appreciated.
- #
- 
--#tidyincdir = $(includedir)/tidy
--tidyincdir = $(includedir)
-+tidyincdir = $(includedir)/tidy
-+#tidyincdir = $(includedir)
- 
- tidyinc_HEADERS = \
- 	platform.h \
diff --git a/www/tidy-devel/files/patch-console__tidy.c b/www/tidy-devel/files/patch-console__tidy.c
deleted file mode 100644
index 740cc772b942..000000000000
--- a/www/tidy-devel/files/patch-console__tidy.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- console/tidy.c.orig	2008-03-22 20:53:08 UTC
-+++ console/tidy.c
-@@ -1031,6 +1031,9 @@ int main( int argc, char** argv )
-             else if ( strcasecmp(arg, "quiet") == 0 )
-                 tidyOptSetBool( tdoc, TidyQuiet, yes );
- 
-+            else if ( strcasecmp(arg, "preserve") == 0 ) /* NOOP for docproj */
-+                printf( errout, "Warning: tidy-devel does not honour the -preserve flag\n");
-+
-             else if ( strcasecmp(arg, "help") == 0 ||
-                       strcasecmp(arg,    "h") == 0 || *arg == '?' )
-             {
diff --git a/www/tidy-devel/files/patch-include_platform.h b/www/tidy-devel/files/patch-include_platform.h
deleted file mode 100644
index 1fd20533bbeb..000000000000
--- a/www/tidy-devel/files/patch-include_platform.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- include/platform.h.orig	2008-03-17 12:57:01 UTC
-+++ include/platform.h
-@@ -33,7 +33,7 @@ extern "C" {
-   It enables tidy to find config files named ~/.tidyrc if 
-   the HTML_TIDY environment variable is not set.
- */
--/* #define TIDY_USER_CONFIG_FILE "~/.tidyrc" */
-+#define TIDY_USER_CONFIG_FILE "~/.tidyrc"
- 
- /*
-   Uncomment the following #define if your
-@@ -48,7 +48,7 @@ extern "C" {
-   Contributed by Todd Lewis.
- */
- 
--/* #define SUPPORT_GETPWNAM */
-+#define SUPPORT_GETPWNAM
- 
- 
- /* Enable/disable support for Big5 and Shift_JIS character encodings */
diff --git a/www/tidy-devel/files/patch-src_lexer.c b/www/tidy-devel/files/patch-src_lexer.c
deleted file mode 100644
index a34e4bdf6a60..000000000000
--- a/www/tidy-devel/files/patch-src_lexer.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/lexer.c.orig	2008-03-22 21:06:55 UTC
-+++ src/lexer.c
-@@ -3467,16 +3467,17 @@ static tmbstr ParseValue( TidyDocImpl* d
-         /* and prompts attributes unless --literal-attributes is set to yes      */
-         /* #994841 - Whitespace is removed from value attributes                 */
- 
--        if (munge &&
-+	/* Issue #217 from tidy-html5 - Also only if/while (len > 0) - MUST NEVER GO NEGATIVE! */
-+        if ((len > 0) && munge &&
-             TY_(tmbstrcasecmp)(name, "alt") &&
-             TY_(tmbstrcasecmp)(name, "title") &&
-             TY_(tmbstrcasecmp)(name, "value") &&
-             TY_(tmbstrcasecmp)(name, "prompt"))
-         {
--            while (TY_(IsWhite)(lexer->lexbuf[start+len-1]))
-+            while (TY_(IsWhite)(lexer->lexbuf[start+len-1]) && (len > 0))
-                 --len;
- 
--            while (TY_(IsWhite)(lexer->lexbuf[start]) && start < len)
-+            while (TY_(IsWhite)(lexer->lexbuf[start]) && (start < len) && (len > 0))
-             {
-                 ++start;
-                 --len;
diff --git a/www/tidy-devel/pkg-descr b/www/tidy-devel/pkg-descr
deleted file mode 100644
index 0de415244ec1..000000000000
--- a/www/tidy-devel/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-When editing HTML it's easy to make mistakes. Wouldn't it be nice if
-there was a simple way to fix these mistakes automatically and tidy up
-sloppy editing into nicely layed out markup?  Well now there is thanks
-to Hewlett Packard's Dave Raggett. HTML TIDY is a free utility for
-doing just that. It also works great on the attrociously hard to read
-markup generated by specialized HTML editors and conversion tools, and
-can help you identify where you need to pay further attention on
-making your pages more accessible to people with disabilities.
-
-Tidy is able to fix up a wide range of problems and to bring to your
-attention things that you need to work on yourself. Each item found is
-listed with the line number and column so that you can see where the
-problem lies in your markup. Tidy won't generate a cleaned up version
-when there are problems that it can't be sure of how to handle. These
-are logged as "errors" rather than "warnings".
diff --git a/www/tidy-devel/pkg-plist b/www/tidy-devel/pkg-plist
deleted file mode 100644
index 34b066cd5f49..000000000000
--- a/www/tidy-devel/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-bin/tab2space
-bin/tidy
-include/tidy/buffio.h
-include/tidy/platform.h
-include/tidy/tidy.h
-include/tidy/tidyenum.h
-%%SHLIB%%lib/libtidy-0.99.so.0
-%%SHLIB%%lib/libtidy-0.99.so.0.0.0
-%%SHLIB%%lib/libtidy.so
-lib/libtidy.a
-%%NSHLIB%%man/man1/tidy.1.gz
-%%PORTDOCS%%%%DOCSDIR%%/Overview.html
-%%PORTDOCS%%%%DOCSDIR%%/checked_by_tidy.gif
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/grid.gif
-%%PORTDOCS%%%%DOCSDIR%%/pending.html
-%%NSHLIB%%%%PORTDOCS%%%%DOCSDIR%%/quickref.html
-%%PORTDOCS%%%%DOCSDIR%%/release-notes.html
-%%PORTDOCS%%%%DOCSDIR%%/tidy.css
-%%PORTDOCS%%%%DOCSDIR%%/tidy.gif
diff --git a/www/tidy-lib/Makefile b/www/tidy-lib/Makefile
deleted file mode 100644
index 0cdd5356bbd4..000000000000
--- a/www/tidy-lib/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-PORTNAME=	tidy
-CATEGORIES=	www
-PKGNAMESUFFIX=	-lib
-
-MAINTAINER=	thierry@FreeBSD.org
-COMMENT=	Utility to clean up and pretty print HTML/XHTML/XML (with shared lib)
-
-DEPRECATED=	no more dev at SF, replaced by www/tidy-html5
-EXPIRATION_DATE=	2024-03-23
-
-MASTERDIR=	${.CURDIR}/../../www/tidy-devel
-
-WITH_SHLIB=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/www/tidy-lib/pkg-descr b/www/tidy-lib/pkg-descr
deleted file mode 100644
index bcd16b7c47b9..000000000000
--- a/www/tidy-lib/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-This is tidy-devel, built with a shared lib.
-
-When editing HTML it's easy to make mistakes. Wouldn't it be nice if
-there was a simple way to fix these mistakes automatically and tidy up
-sloppy editing into nicely layed out markup?  Well now there is thanks
-to Hewlett Packard's Dave Raggett. HTML TIDY is a free utility for
-doing just that. It also works great on the attrociously hard to read
-markup generated by specialized HTML editors and conversion tools, and
-can help you identify where you need to pay further attention on
-making your pages more accessible to people with disabilities.
-
-Tidy is able to fix up a wide range of problems and to bring to your
-attention things that you need to work on yourself. Each item found is
-listed with the line number and column so that you can see where the
-problem lies in your markup. Tidy won't generate a cleaned up version
-when there are problems that it can't be sure of how to handle. These
-are logged as "errors" rather than "warnings".