7 files changed, 15 insertions, 21 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index 175c553b9f2a..0be0d8d304fe 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -473,6 +473,7 @@
     SUBDIR += makefaq
     SUBDIR += makepatch
     SUBDIR += man2html
+    SUBDIR += mandoc
     SUBDIR += mantra
     SUBDIR += markdown
     SUBDIR += markdown-mode.el
@@ -484,7 +485,6 @@
     SUBDIR += mdbook
     SUBDIR += mdbook-linkcheck
     SUBDIR += mdbook-mermaid
-    SUBDIR += mdocml
     SUBDIR += meilisearch
     SUBDIR += meld
     SUBDIR += metauml
diff --git a/textproc/mdocml/Makefile b/textproc/mandoc/Makefile
index 30d1e610807b..54773537bef6 100644
--- a/textproc/mdocml/Makefile
+++ b/textproc/mandoc/Makefile
@@ -1,14 +1,13 @@
-PORTNAME=	mdocml
+PORTNAME=	mandoc
 PORTVERSION=	1.14.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
-MASTER_SITES=	http://mdocml.bsd.lv/snapshots/ \
+MASTER_SITES=	http://mandoc.bsd.lv/snapshots/ \
 		LOCAL/uqs
-DISTNAME=	mandoc-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	mdoc macro compiler
-WWW=		https://mdocml.bsd.lv/
+COMMENT=	Suite of for tools compiling mdoc and man macros
+WWW=		https://mandoc.bsd.lv/
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -27,7 +26,7 @@ post-configure:
 		-e 's|/var/www|${WWWDIR}|' \
 		-e 's|^MANDIR.*|MANDIR=${PREFIX}/share/man|' \
 		${WRKSRC}/Makefile.local
-	cp ${WRKSRC}/cgi.h.example ${WRKSRC}/cgi.h
+	${CP} ${WRKSRC}/cgi.h.example ${WRKSRC}/cgi.h
 
 post-build:
 	cd ${WRKSRC} && ${MAKE} ${MAKE_ARGS} man.cgi
diff --git a/textproc/mdocml/distinfo b/textproc/mandoc/distinfo
index 661dbd113f5c..661dbd113f5c 100644
--- a/textproc/mdocml/distinfo
+++ b/textproc/mandoc/distinfo
diff --git a/textproc/mdocml/files/patch-msec.in b/textproc/mandoc/files/patch-msec.in
index 09099808709e..09099808709e 100644
--- a/textproc/mdocml/files/patch-msec.in
+++ b/textproc/mandoc/files/patch-msec.in
diff --git a/textproc/mandoc/pkg-descr b/textproc/mandoc/pkg-descr
new file mode 100644
index 000000000000..203e31f5ebb6
--- /dev/null
+++ b/textproc/mandoc/pkg-descr
@@ -0,0 +1,8 @@
+mandoc is a suite of tools compiling mdoc, the roff macro language of
+choice for BSD manual pages, and man, the predominant historical language
+for UNIX manuals. It is small, ISO C, ISC-licensed, and quite fast. The
+main component of the toolset is the mandoc utility program, based on the
+libmandoc validating compiler, to format output for UTF-8 and ASCII UNIX
+terminals, HTML 5, PostScript, and PDF.
+
+mandoc was formerly distributed as mdocml.
diff --git a/textproc/mdocml/pkg-plist b/textproc/mandoc/pkg-plist
index e7106c0d7e89..e7106c0d7e89 100644
--- a/textproc/mdocml/pkg-plist
+++ b/textproc/mandoc/pkg-plist
diff --git a/textproc/mdocml/pkg-descr b/textproc/mdocml/pkg-descr
deleted file mode 100644
index c81d360bb4ae..000000000000
--- a/textproc/mdocml/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-mdocml is a suite of tools compiling mdoc, the roff macro package of
-choice for BSD manual pages, and man, the predominant historical
-package for UNIX manuals. The mission of mdocml is to deprecate groff,
-the GNU troff implementation, for displaying mdoc pages whilst
-providing token support for man.
-
-mdocml consists of the libmandoc validating compiler and mandoc, which
-interfaces with the compiler library to format output for UNIX
-terminals (with support for wide-character locales), XHTML, HTML,
-PostScript, and PDF.
-
-Disambiguation: mdocml is often referred to by its installed binary,
-"mandoc".