Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 Apr 2026 00:12:57 +0000
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Cc:        WATANABE Kazuhiro <CQG00620@nifty.ne.jp>
Subject:   git: 96b7289d680c - 2026Q2 - japanese/mh: fix build on 16.0-current/15.0-stable and add LICENSE
Message-ID:  <69eeaa09.1f613.7280a334@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch 2026Q2 has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=96b7289d680cb744fc2f4310770a2cfd683d422a

commit 96b7289d680cb744fc2f4310770a2cfd683d422a
Author:     WATANABE Kazuhiro <CQG00620@nifty.ne.jp>
AuthorDate: 2026-04-24 13:52:48 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2026-04-27 00:11:12 +0000

    japanese/mh: fix build on 16.0-current/15.0-stable and add LICENSE
    
    ${WRKSRC}/uip/vmh.c includes <term.h> (a part of ncurses).
    And on FreeBSD term.h includes <termios.h> with ncurses-6.5.
    
    But since ncurses-6.6 term.h doesn't include termios/termio/sgttyb headers
    and doesn't define some related symbols.  These directive has been excluded
    with "#ifdef NCURSES_INTERNALS".
    
    PR:             293936
    MFH:            2026Q2
    See also:       https://forums.gentoo.org/viewtopic-t-1100154-start-0-postdays-0-postorder-asc-highlight-.html
    Event:          Wiesbaden Hackathon 202604
    
    (cherry picked from commit b0f02c542d233b6e9f21db6fe1cfc6ff3e47526f)
---
 japanese/mh/Makefile              |  5 ++++-
 japanese/mh/files/patch-uip_vmh.c | 19 +++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile
index 7d7d53ceab23..9e3291feccfd 100644
--- a/japanese/mh/Makefile
+++ b/japanese/mh/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mh
 PORTVERSION=	${VERSION}.j${JP_VERSION}
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	japanese mail
 MASTER_SITES=	ftp://ftp.laic.u-hyogo.ac.jp/pub/net/mh/
 DISTNAME=	${PORTNAME}-${VERSION}-JP-${JP_VERSION}
@@ -8,6 +8,9 @@ DISTNAME=	${PORTNAME}-${VERSION}-JP-${JP_VERSION}
 MAINTAINER=	CQG00620@nifty.ne.jp
 COMMENT=	Rand MH mail handling system + Japanese patches
 
+LICENSE=	PD
+LICENSE_FILE=	${WRKSRC}/READ-ME
+
 BUILD_DEPENDS=	jless:japanese/less
 RUN_DEPENDS=	jless:japanese/less
 
diff --git a/japanese/mh/files/patch-uip_vmh.c b/japanese/mh/files/patch-uip_vmh.c
index 5143d4a17164..840f9f30c508 100644
--- a/japanese/mh/files/patch-uip_vmh.c
+++ b/japanese/mh/files/patch-uip_vmh.c
@@ -1,16 +1,27 @@
 --- uip/vmh.c.orig	2001-04-21 11:16:49 UTC
 +++ uip/vmh.c
-@@ -116,6 +116,13 @@ void     __cputchar __P((int));
+@@ -42,6 +42,10 @@ static char ident[] = "@(#)$Id: vmh.c,v 1.20 1993/08/2
+ #endif
+ #undef	OK			/* tricky */
+ #ifdef	TERMINFO
++#include <sys/param.h>
++#if defined(__FreeBSD__) && __FreeBSD_version > 1500068
++#define NCURSES_INTERNALS
++#endif
+ #include <term.h>	/* variables describing terminal capabilities */
+ #if defined(HAVE_TCGETATTR) && !defined(TCGETATTR)
+ #define TCGETATTR
+@@ -115,6 +119,13 @@ void     __cputchar __P((int));
  
- #define	XYZ			/* XXX */
  
+ #define	XYZ			/* XXX */
++
 +#if defined(__FreeBSD__) && __FreeBSD__ >= 5
 +struct ldat
 +{
 +	unsigned long	*text;
 +};
 +#endif
-+
+ 
  /*  */
  
- static struct swit switches[] = {


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69eeaa09.1f613.7280a334>