[pkgsrc/trunk]: pkgsrc Switch from mdocml to mandoc; remove obsolete references.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5e49cc3348b5
branches:  trunk
changeset: 366035:5e49cc3348b5
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Aug 01 15:09:52 2017 +0000

description:
Switch from mdocml to mandoc; remove obsolete references.

diffstat:

 devel/man-pages/Makefile          |  22 +---------------------
 mk/tools/replace.mk               |  12 ++++++------
 textproc/groff/Makefile           |   4 +---
 textproc/verify-synopsis/Makefile |   4 ++--
 4 files changed, 10 insertions(+), 32 deletions(-)

diffs (103 lines):

diff -r ba9dfaaacd2e -r 5e49cc3348b5 devel/man-pages/Makefile
--- a/devel/man-pages/Makefile  Tue Aug 01 15:06:24 2017 +0000
+++ b/devel/man-pages/Makefile  Tue Aug 01 15:09:52 2017 +0000
@@ -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 @@
 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 -r ba9dfaaacd2e -r 5e49cc3348b5 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Tue Aug 01 15:06:24 2017 +0000
+++ b/mk/tools/replace.mk       Tue Aug 01 15:09:52 2017 +0000
@@ -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 @@
 
 ######################################################################
 
-# 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 -r ba9dfaaacd2e -r 5e49cc3348b5 textproc/groff/Makefile
--- a/textproc/groff/Makefile   Tue Aug 01 15:06:24 2017 +0000
+++ b/textproc/groff/Makefile   Tue Aug 01 15:09:52 2017 +0000
@@ -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 @@
 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 -r ba9dfaaacd2e -r 5e49cc3348b5 textproc/verify-synopsis/Makefile
--- a/textproc/verify-synopsis/Makefile Tue Aug 01 15:06:24 2017 +0000
+++ b/textproc/verify-synopsis/Makefile Tue Aug 01 15:09:52 2017 +0000
@@ -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 @@
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} != "NetBSD"
-DEPENDS+=      mdocml-[0-9]*:../../textproc/mdocml
+DEPENDS+=      mandoc-[0-9]*:../../textproc/mandoc
 .endif
 
 SUBST_CLASSES+=                prefix