From owner-svn-ports-head@freebsd.org Sun Feb 3 10:51:17 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2273A14C3084; Sun, 3 Feb 2019 10:51:17 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BAD6F8F07F; Sun, 3 Feb 2019 10:51:16 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7D31A1D887; Sun, 3 Feb 2019 10:51:16 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x13ApGxx089727; Sun, 3 Feb 2019 10:51:16 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x13ApF1T089723; Sun, 3 Feb 2019 10:51:15 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201902031051.x13ApF1T089723@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 3 Feb 2019 10:51:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492045 - in head/japanese/mh: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head/japanese/mh: . files X-SVN-Commit-Revision: 492045 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BAD6F8F07F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Feb 2019 10:51:17 -0000 Author: pi Date: Sun Feb 3 10:51:15 2019 New Revision: 492045 URL: https://svnweb.freebsd.org/changeset/ports/492045 Log: 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 (maintainer), nyan MFH: 2019Q1 Added: head/japanese/mh/files/patch-conf_doc_me2man.sed (contents, props changed) head/japanese/mh/files/patch-conf_doc_tmac.h (contents, props changed) head/japanese/mh/files/patch-conf_makefiles_doc (contents, props changed) Modified: head/japanese/mh/Makefile Modified: head/japanese/mh/Makefile ============================================================================== --- head/japanese/mh/Makefile Sun Feb 3 10:33:55 2019 (r492044) +++ head/japanese/mh/Makefile Sun Feb 3 10:51:15 2019 (r492045) @@ -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/* Added: head/japanese/mh/files/patch-conf_doc_me2man.sed ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mh/files/patch-conf_doc_me2man.sed Sun Feb 3 10:51:15 2019 (r492045) @@ -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 Added: head/japanese/mh/files/patch-conf_doc_tmac.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mh/files/patch-conf_doc_tmac.h Sun Feb 3 10:51:15 2019 (r492045) @@ -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 '' Added: head/japanese/mh/files/patch-conf_makefiles_doc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mh/files/patch-conf_makefiles_doc Sun Feb 3 10:51:15 2019 (r492045) @@ -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 $@ $< +