Switch from mdocml to mandoc; remove obsolete references.

4 files changed, 10 insertions, 32 deletions

diff --git a/devel/man-pages/Makefile b/devel/man-pages/Makefile
index 424dae94e04..36ec14ba76e 100644
--- a/devel/man-pages/Makefile
+++ b/devel/man-pages/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/10/03 20:37:53 kamil Exp $
-#
+# $NetBSD: Makefile,v 1.6 2017/08/01 15:09:53 wiz Exp $
 
 DISTNAME=	man-pages-4.05
 PKGREVISION=	1
@@ -17,23 +16,4 @@ NO_BUILD=	# This package only installs files.
 USE_LANGUAGES=	# none
 MAKE_FLAGS+=	prefix=${PREFIX} DESTDIR=${DESTDIR}
 
-# iconv.3, iconv_close.3, iconv_open.3
-CONFLICTS+=	libiconv-[0-9]*
-# dladdr.3, dlcose.3, dlerror.3, dlopen.3, dlsym.3
-CONFLICTS+=	dlcompat-[0-9]*
-# getopt_long.3
-CONFLICTS+=	libgetopt-[0-9]*
-# sem_destroy.3, sem_getvalue.3, sem_init.3, sem_post.3, sem_trywait.3,
-# sem_wait.3
-CONFLICTS+=	pthread-sem-[0-9]*
-# getaddrinfo.3, gethostbyname.3, getipnodebyname.3, getnameinfo.3,
-# getnetent.3, resolver.3, resolver.5, hostname.7
-CONFLICTS+=	libbind-[0-9]*
-# ftpusers.5
-CONFLICTS+=	tnftpd-[0-9]*
-# des_crypt.3 (when des option is enabled)
-CONFLICTS+=	kth-krb4-[0-9]*
-# man.7, mdoc.7
-CONFLICTS+=	mdocml-[0-9]*
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 1aaa592e843..a56b5e5cedf 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.279 2017/04/23 14:18:09 taca Exp $
+# $NetBSD: replace.mk,v 1.280 2017/08/01 15:09:52 wiz Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -990,18 +990,18 @@ TOOLS_PATH.${_t_}=	${LOCALBASE}/bin/g${_t_}
 
 ######################################################################
 
-# These tools are supplied by textproc/mdocml as replacements for their
+# These tools are supplied by textproc/mandoc as replacements for their
 # groff counterparts.  As this package has fewer dependencies it should
 # be preferred over groff wherever possible.
 #
-_TOOLS.mdocml=	nroff
+_TOOLS.mandoc=	nroff
 
-.for _t_ in ${_TOOLS.mdocml}
+.for _t_ in ${_TOOLS.mandoc}
 .  if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
-.    if !empty(PKGPATH:Mtextproc/mdocml)
+.    if !empty(PKGPATH:Mtextproc/mandoc)
 MAKEFLAGS+=		TOOLS_IGNORE.${_t_}=
 .    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
-TOOLS_DEPENDS.${_t_}?=	mdocml>=1.12.0nb3:../../textproc/mdocml
+TOOLS_DEPENDS.${_t_}?=	mandoc>=1.12.0nb3:../../textproc/mandoc
 TOOLS_CREATE+=		${_t_}
 TOOLS_PATH.${_t_}=	${LOCALBASE}/bin/mandoc
 .    endif
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 0908f1d88df..10dd938973c 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2017/01/18 13:44:46 leot Exp $
+# $NetBSD: Makefile,v 1.86 2017/08/01 15:09:53 wiz Exp $
 
 DISTNAME=	groff-1.22.3
 PKGREVISION=	5
@@ -10,8 +10,6 @@ HOMEPAGE=	http://www.gnu.org/software/groff/groff.html
 COMMENT=	GNU roff text processing suite
 LICENSE=	gnu-gpl-v3
 
-CONFLICTS=		mdocml<1.12.0nb3 ja-groff-[0-9]*
-
 CHECK_PERMS=		NO
 MAKE_JOBS_SAFE=		NO
 OVERRIDE_DIRDEPTH=	4
diff --git a/textproc/verify-synopsis/Makefile b/textproc/verify-synopsis/Makefile
index 060584dd6d5..abf508e5859 100644
--- a/textproc/verify-synopsis/Makefile
+++ b/textproc/verify-synopsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/02/12 18:56:54 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/01 15:09:52 wiz Exp $
 
 DISTNAME=	verify-synopsis-1.0
 CATEGORIES=	textproc
@@ -19,7 +19,7 @@ USE_LANGUAGES=	# none
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} != "NetBSD"
-DEPENDS+=	mdocml-[0-9]*:../../textproc/mdocml
+DEPENDS+=	mandoc-[0-9]*:../../textproc/mandoc
 .endif
 
 SUBST_CLASSES+=		prefix