1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-19 08:13:21 +00:00

japanese/mh: Fix man pages, runtime error

- man pages breakage on FreeBSD 11.x and later
- runtime error due to lld 6.0 issue, fixed by using lld 7.0

PR:		233463, 235456
Submitted by:	WATANABE Kazuhiro <CQG00620@nifty.ne.jp> (maintainer), nyan
MFH:		2019Q1
This commit is contained in:
Kurt Jaeger 2019-02-03 10:51:15 +00:00
parent e7e5512f4b
commit ff4b9d7ebd
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=492045
4 changed files with 121 additions and 1 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= mh
PORTVERSION= ${VERSION}.j${JP_VERSION}
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= japanese mail
MASTER_SITES= ftp://ftp.laic.u-hyogo.ac.jp/pub/net/mh/ \
http://mirror.amdmi3.ru/distfiles/
@ -24,6 +24,7 @@ CONFIGURE_ARGS= --enable-batchmode \
--enable-jmandir=${MANPREFIX}/man/ja
MAKE_JOBS_UNSAFE= yes
CFLAGS+= -Wno-return-type
LLD_UNSAFE= yes
USE_LDCONFIG= yes
@ -37,6 +38,18 @@ OPTIONS_DEFINE= DOCS
post-patch:
${REINPLACE_CMD} -e "s/-O /${CFLAGS} /g" ${WRKSRC}/configure
.for i in comp dist forw mh-mail mhl ja-comp ja-dist ja-forw ja-mh-mail ja-mhl
@(cd ${WRKSRC}/conf/doc && \
${AWK} '{ \
if (/^\.so/) { \
ifile="../../support/general" substr($$2, index($$2, "/")); \
while((getline l < ifile > 0)) \
print l; \
close(ifile); \
} else \
print; \
}' ${i}.rf > ${i}.tmp && ${MV} ${i}.tmp ${i}.rf)
.endfor
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*

View File

@ -0,0 +1,10 @@
--- conf/doc/me2man.sed.orig 1993-12-01 04:00:17 UTC
+++ conf/doc/me2man.sed
@@ -8,3 +8,7 @@
/^\.DE$/c\
.in -.5i\
.SH DESCRIPTION
+## replace delimiter and padding character used with .fc macro
+s/^^\(.*\)~^\(.*\)$/\1 \2/
+## "\ " and "\0" losts the whitespace with mandoc
+s/\\[ 0]/ /g

View File

@ -0,0 +1,86 @@
--- conf/doc/tmac.h.orig 1993-12-01 04:00:20 UTC
+++ conf/doc/tmac.h
@@ -3,62 +3,46 @@
.\" Try to keep only one copy of the documentation around
.\" by re-defining macros and so forth.
.\"
-.fc ^ ~
.\" I pity the fool who tampers with the next line...
.ds ZZ -man
-.de SC \" Title section
-.TH \\$1 \\$2 @(MHCENTERFOOT) @(MHLEFTFOOT)
-..
-.de NA \" Name section
-.SH NAME
-..
-.de SY \" Synopsis section
-.SH SYNOPSIS
-.in +.5i
-.ti -.5i
-..
-.de DE \" Description section
-.in -.5i
-.SH DESCRIPTION
-..
-.de Fi \" Files section
+.de Fi
.SH FILES
.nf
.ta \w'@(MHETCPATH)/ExtraBigFileName 'u
..
-.de Pr \" Profile section
-.SH "PROFILE\ COMPONENTS"
+.de Pr
+.SH "PROFILE COMPONENTS"
.nf
.ta 2.4i
.ta \w'ExtraBigProfileName 'u
..
-.de Ps \" Profile next
+.de Ps
.br
..
-.de Sa \" See Also section
+.de Sa
.fi
-.SH "SEE\ ALSO"
+.SH "SEE ALSO"
..
-.de De \" Defaults section
+.de De
.SH "DEFAULTS"
.nf
..
-.de Ds \" Defaults next
+.de Ds
.br
..
-.de Co \" Context section
+.de Co
.fi
.SH CONTEXT
..
-.de Hh \" Hints section
+.de Hh
.fi
.SH "HELPFUL HINTS"
..
-.de Hi \" History section
+.de Hi
.fi
.SH HISTORY
..
-.de Bu \" Bugs section
+.de Bu
.fi
.SH BUGS
..
@@ -75,3 +59,8 @@
.de re
.ta 0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i
..
+.\" This defines appropriate quote strings for nroff and troff
+.ds lq \&"
+.ds rq \&"
+.if t .ds lq ``
+.if t .ds rq ''

View File

@ -0,0 +1,11 @@
--- conf/makefiles/doc.orig 1999-02-09 11:30:00 UTC
+++ conf/makefiles/doc
@@ -239,7 +239,7 @@ inst-jman8= inst-ja-ap inst-ja-conflict inst-ja-dp ins
.me.doc:; nroff -Tlpr -me $< > $@
-.me.man:; cat tmac.me $< | sed -f me2man.sed @(MHCATMAN) > $@
+.me.man:; cat tmac.h $< | sed -f me2man.sed @(MHCATMAN) > $@
.cat.imp:; catimp -i $@ $<