Ticket #53902: man.diff

File man.diff, 3.0 KB (added by janstary (Jan Starý), 7 years ago)

sort out the relations between the manpage formaters

  • sysutils/groff/Portfile 

    diff --git a/sysutils/groff/Portfile b/sysutils/groff/Portfile
index 4a08feb77d..8a81dd1009 100644
    a b  
    33PortSystem          1.0
    44
    55name                groff
    6 conflicts           mdocml
    76version             1.22.3
    87revision            1
    98categories          sysutils textproc

  • sysutils/man/Portfile 

    diff --git a/sysutils/man/Portfile b/sysutils/man/Portfile
index faa7ee1b6c..2d53faed76 100644
    a b revision 1 
    88categories          sysutils
    99platforms           darwin
    1010maintainers         nomaintainer
    11 conflicts           man2html
     11conflicts           man2html mandoc
    1212license             GPL-2
    1313description         The man page suite containing man, apropos, whatis, man2html
    1414long_description    The man page suite (man, apropos, and whatis) contains \

  • textproc/mandoc/Portfile 

    diff --git a/textproc/mandoc/Portfile b/textproc/mandoc/Portfile
index f6071d256b..5f381a2c0d 100644
    a b version 1.14.1 
    77description         UNIX manpage compiler
    88homepage            http://mdocml.bsd.lv/
    99categories          textproc
     10conflicts           man
    1011license             ISC
    1112maintainers         eitanadler.com:lists openmaintainer
    1213platforms           openbsd freebsd netbsd darwin
    … … pre-configure { 
    2829    set content [subst {
    2930
    3031PREFIX="${prefix}"
     32MANDIR="${prefix}/share/man"
    3133
    32 MANM_MANCONF="mandoc.conf"
     34# Use separate manpage names for the language references,
     35# like groff does with groff_man(7) etc, so we can coexist.
    3336MANM_MAN="mandoc_man"
    3437MANM_MDOC="mandoc_mdoc"
    3538MANM_ROFF="mandoc_roff"
    3639MANM_EQN="mandoc_eqn"
    3740MANM_TBL="mandoc_tbl"
    3841
    39 BINM_MAN="mman"
    40 BINM_APROPOS="mapropos"
    41 BINM_WHATIS="mwhatis"
    42 BINM_MAKEWHATIS="mandocdb"
     42# On the other hand, just use man.conf
     43# MANM_MANCONF="mandoc.conf"
     44
     45# Rename our soelim(1). That way we have no conflict with groff.
     46# We don't mind using some other soelim implementation.
    4347BINM_SOELIM="msoelim"
    4448
     49# User the usual chmod
    4550INSTALL_PROGRAM="${configure.install} -m 0755"
    4651INSTALL_LIB="${configure.install} -m 0644"
    4752INSTALL_MAN="${configure.install} -m 0644"
    4853INSTALL_DATA="${configure.install} -m 0644"
    4954
    5055INSTALL_LIBMANDOC=0
    51 BUILD_CGI=0
    5256BUILD_CATMAN=0
     57BUILD_CGI=0
    5358
    5459CC="${configure.cc}"
    5560CFLAGS="${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]"
    … … LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" 
    5863} ]
    5964
    6065    set fd [open "${filename}" "w"]
    61     puts -nonewline "${fd}" "${content}"
     66    puts "${fd}" "${content}"
    6267    close "${fd}"
    6368}
    6469
    … … LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" 
    6974# Kudos to jmr and ryandesign for explaining that.
    7075variant universal   {}
    7176
     77build.args          CC="${configure.cc}"
    7278build.env           CFLAGS="${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]" \
    7379                    LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
    74 build.args          CC="${configure.cc}"