From owner-svn-ports-all@freebsd.org  Fri May 13 19:24:56 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25564B3A245;
 Fri, 13 May 2016 19:24:56 +0000 (UTC)
 (envelope-from bapt@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 mx1.freebsd.org (Postfix) with ESMTPS id B9FAB19BE;
 Fri, 13 May 2016 19:24:55 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4DJOtvR069430;
 Fri, 13 May 2016 19:24:55 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4DJOqkx069395;
 Fri, 13 May 2016 19:24:52 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201605131924.u4DJOqkx069395@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 13 May 2016 19:24:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r415138 - in head/japanese: dvi2tty epwutil/files
 kdrill/files kinput2/files mh/files prn/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 May 2016 19:24:56 -0000

Author: bapt
Date: Fri May 13 19:24:51 2016
New Revision: 415138
URL: https://svnweb.freebsd.org/changeset/ports/415138

Log:
  Prevent collision with getline(3)

Added:
  head/japanese/epwutil/files/patch-catdump.c   (contents, props changed)
  head/japanese/kdrill/files/patch-externs.h   (contents, props changed)
  head/japanese/kdrill/files/patch-readfile.c   (contents, props changed)
  head/japanese/mh/files/patch-h_mh.h   (contents, props changed)
  head/japanese/mh/files/patch-sbr_concat.c   (contents, props changed)
  head/japanese/mh/files/patch-support_pop_popser.c   (contents, props changed)
  head/japanese/mh/files/patch-uip_popsbr.c   (contents, props changed)
  head/japanese/mh/files/patch-uip_pshsbr.c   (contents, props changed)
  head/japanese/mh/files/patch-uip_rcvtty.c   (contents, props changed)
  head/japanese/mh/files/patch-uip_replsbr.c   (contents, props changed)
  head/japanese/mh/files/patch-uip_slocal.c   (contents, props changed)
  head/japanese/mh/files/patch-uip_vmh.c   (contents, props changed)
Deleted:
  head/japanese/mh/files/patch-ao
  head/japanese/mh/files/patch-h:mh.h
  head/japanese/mh/files/patch-sbr:concat.c
  head/japanese/mh/files/patch-uip:rcvtty.c
  head/japanese/mh/files/patch-uip:slocal.c
  head/japanese/mh/files/patch-uip:vmh.c
Modified:
  head/japanese/dvi2tty/Makefile
  head/japanese/epwutil/files/patch-makefile.unx
  head/japanese/kdrill/files/patch-Imakefile
  head/japanese/kdrill/files/patch-makedic-Makefile
  head/japanese/kinput2/files/patch-cmd_Kinput2.ad
  head/japanese/kinput2/files/patch-lib_CcWnn.c
  head/japanese/kinput2/files/patch-lib_IMProto.c
  head/japanese/kinput2/files/patch-lib_cconv.c
  head/japanese/kinput2/files/patch-lib_imlib_imconv.c
  head/japanese/kinput2/files/patch-lib_imlib_imfuncs.h
  head/japanese/kinput2/files/patch-lib_imlib_imxport.c
  head/japanese/mh/files/patch-conf__makefiles__uip
  head/japanese/mh/files/patch-configure
  head/japanese/mh/files/patch-uip_msh.c
  head/japanese/mh/files/patch-uip_prompter.c
  head/japanese/mh/files/patch-uip_trmsbr.c
  head/japanese/prn/files/patch-Makefile
  head/japanese/prn/files/patch-cmt.c
  head/japanese/prn/files/patch-cmt.h
  head/japanese/prn/files/patch-cmt.jman
  head/japanese/prn/files/patch-defs.c
  head/japanese/prn/files/patch-euc.c
  head/japanese/prn/files/patch-prn.c
  head/japanese/prn/files/patch-prn.jman   (contents, props changed)
  head/japanese/prn/files/patch-psconv.c
  head/japanese/prn/files/patch-psconv.jman
  head/japanese/prn/files/patch-reg.y

Modified: head/japanese/dvi2tty/Makefile
==============================================================================
--- head/japanese/dvi2tty/Makefile	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/dvi2tty/Makefile	Fri May 13 19:24:51 2016	(r415138)
@@ -22,6 +22,9 @@ PLIST_FILES=	bin/jdvi2tty \
 		bin/jdisdvi \
 		man/man1/jdvi2tty.1.gz
 
+post-patch:
+	${REINPLACE_CMD} -e "s/getline/get_line/g" ${WRKSRC}/dvistuff.c
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/jdvi2tty ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/disdvi ${STAGEDIR}${PREFIX}/bin/jdisdvi

Added: head/japanese/epwutil/files/patch-catdump.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/epwutil/files/patch-catdump.c	Fri May 13 19:24:51 2016	(r415138)
@@ -0,0 +1,56 @@
+--- catdump.c.orig	2016-05-13 19:10:22 UTC
++++ catdump.c
+@@ -201,7 +201,7 @@ void	outhex();
+ void	outstr();
+ void	outjstr();
+ int	undump();
+-uchr	*getline();
++uchr	*get_line();
+ uchr	*getvalue();
+ int	gethex();
+ int	hexdigit();
+@@ -561,7 +561,7 @@ char	*txtfile, *catalog;
+     err = 0;
+     line = 0;
+ 
+-    if (getline(buf, fp) == NULL ||
++    if (get_line(buf, fp) == NULL ||
+ 	strncmp(buf, CAT_ENTRY, strlen(CAT_ENTRY))) {
+ 	fprintf(stderr, "ERR: 項目 %s がありません\n", CAT_ENTRY);
+ 	fclose(fp);
+@@ -571,7 +571,7 @@ char	*txtfile, *catalog;
+     st = 0;
+     hdr = (HDR_T *)catbuf;
+     mask = 0L;
+-    while (getline(buf, fp) != NULL && *buf != '[') {
++    while (get_line(buf, fp) != NULL && *buf != '[') {
+ 	if ((p = getvalue(buf)) == NULL) {
+ 	    fprintf(stderr, "ERR: line %d: 構文に誤りがあります\n", line);
+ 	    err++;
+@@ -666,7 +666,7 @@ char	*txtfile, *catalog;
+ 	if (strncmp(buf, BOOK_ENTRY, strlen(BOOK_ENTRY))) {
+ 	    fprintf(stderr, "ERR: line %d: 不明な項目です(%s)\n", line, buf);
+ 	    err++;
+-	    while (getline(buf, fp) != NULL && *buf != '[')
++	    while (get_line(buf, fp) != NULL && *buf != '[')
+ 		;
+ 	    if (*buf == '\0')
+ 		break;
+@@ -680,7 +680,7 @@ char	*txtfile, *catalog;
+ 	    break;
+ 	}
+ 	mask = 0;
+-	while (getline(buf, fp) != NULL && *buf != '[') {
++	while (get_line(buf, fp) != NULL && *buf != '[') {
+ 	    if ((p = getvalue(buf)) == NULL) {
+ 		fprintf(stderr, "ERR: line %d: 構文に誤りがあります\n", line);
+ 		err++;
+@@ -917,7 +917,7 @@ char	*txtfile, *catalog;
+ }
+ 
+ uchr *
+-getline(buf, fp)
++get_line(buf, fp)
+ uchr	*buf;
+ FILE	*fp;
+ {

Modified: head/japanese/epwutil/files/patch-makefile.unx
==============================================================================
--- head/japanese/epwutil/files/patch-makefile.unx	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/epwutil/files/patch-makefile.unx	Fri May 13 19:24:51 2016	(r415138)
@@ -1,5 +1,5 @@
---- makefile.unx.orig	Wed Oct 22 16:55:42 2003
-+++ makefile.unx	Wed Oct 22 16:55:57 2003
+--- makefile.unx.orig	1999-01-12 20:22:02 UTC
++++ makefile.unx
 @@ -1,7 +1,8 @@
  # EPWUTIL Makefile for UNIX/gcc
  

Modified: head/japanese/kdrill/files/patch-Imakefile
==============================================================================
--- head/japanese/kdrill/files/patch-Imakefile	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/kdrill/files/patch-Imakefile	Fri May 13 19:24:51 2016	(r415138)
@@ -1,6 +1,6 @@
---- Imakefile.orig	Sat Jan  8 06:59:13 2005
-+++ Imakefile	Fri Aug  5 16:16:00 2005
-@@ -32,9 +32,9 @@
+--- Imakefile.orig	2006-03-05 22:05:00 UTC
++++ Imakefile
+@@ -32,9 +32,9 @@ UNCOMPRESSEXT = .gz
  /* You can change these here, and KDrill.ad will 
   * get created with the matching values. Yaaay!
   */
@@ -13,7 +13,7 @@
  
  # If for some reason, the user prefs stuff isn't working for you, 
  # and you can't compile, uncomment this
-@@ -46,7 +46,10 @@
+@@ -46,7 +46,10 @@ RADLOCATION= /usr/local/lib/radkfile
  # The system should pick some default for you.
  # If you dont like it, uncomment this and use it as you like.
  # This isn't compiled in anywhere, it's just a convenience thing.

Added: head/japanese/kdrill/files/patch-externs.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/kdrill/files/patch-externs.h	Fri May 13 19:24:51 2016	(r415138)
@@ -0,0 +1,11 @@
+--- externs.h.orig	2002-10-01 06:52:38 UTC
++++ externs.h
+@@ -35,7 +35,7 @@ extern void ClearCheat();
+ 
+ /* other "usefull" general functions */
+ extern int xtoi(char *);
+-extern int getline(FILE *, unsigned char *);
++extern int get_line(FILE *, unsigned char *);
+ extern void setstatus(char *);
+ 
+ extern int FindIndex(char *);

Modified: head/japanese/kdrill/files/patch-makedic-Makefile
==============================================================================
--- head/japanese/kdrill/files/patch-makedic-Makefile	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/kdrill/files/patch-makedic-Makefile	Fri May 13 19:24:51 2016	(r415138)
@@ -1,5 +1,5 @@
---- makedic/Makefile.orig	Sun Nov 12 16:18:27 2000
-+++ makedic/Makefile	Sun Nov 12 16:19:21 2000
+--- makedic/Makefile.orig	2000-08-02 21:18:48 UTC
++++ makedic/Makefile
 @@ -5,13 +5,13 @@
  all:	makeedict makedic
  

Added: head/japanese/kdrill/files/patch-readfile.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/kdrill/files/patch-readfile.c	Fri May 13 19:24:51 2016	(r415138)
@@ -0,0 +1,43 @@
+--- readfile.c.orig	2004-02-07 17:58:44 UTC
++++ readfile.c
+@@ -31,7 +31,7 @@ int numberofkanji=0, highestkanji=0, low
+ static char *dictname=NULL;
+ static char *edictname=NULL;
+ 
+-/* getline:
++/* get_line:
+  *	reads a line (from dictionary).
+  *	Deals with 8-bit char reads (or attempts to)
+  *	Also attempts to deal with the problem of variable line length.
+@@ -46,11 +46,11 @@ static char *edictname=NULL;
+  *
+  *	Used in "readstructs()", below. Also "readedict()"
+  *
+- *	Note that this expects static global getline_inptr to be NULL
++ *	Note that this expects static global get_line_inptr to be NULL
+  *	if we have just started reading a stream;
+  */
+ 
+-int getline(FILE *fp,unsigned char *s)
++int get_line(FILE *fp,unsigned char *s)
+ {
+ 	char * val;
+ 	char *endparse;
+@@ -464,7 +464,7 @@ void readedict()
+ 		lowestkanji = nextindex;
+ 	}
+ 
+-	while(getline(fp, instring) != 0)
++	while(get_line(fp, instring) != 0)
+ 	{
+ 		int instrlen;
+ 
+@@ -668,7 +668,7 @@ void readstructs(){
+ 		exit(-1);
+ 	}
+ 
+-	while (getline(fp,instring) != 0) {
++	while (get_line(fp,instring) != 0) {
+ 		int Kanji;
+ 		int freq,grade,N,U,H,Q,SKIP;
+ 		unsigned char *parse;

Modified: head/japanese/kinput2/files/patch-cmd_Kinput2.ad
==============================================================================
--- head/japanese/kinput2/files/patch-cmd_Kinput2.ad	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/kinput2/files/patch-cmd_Kinput2.ad	Fri May 13 19:24:51 2016	(r415138)
@@ -3,9 +3,8 @@ Index: cmd/Kinput2.ad
 RCS file: /home/cvs/private/hrs/kinput2/cmd/Kinput2.ad,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -u -p -r1.1.1.1 -r1.2
---- cmd/Kinput2.ad	7 Dec 2009 06:36:04 -0000	1.1.1.1
-+++ cmd/Kinput2.ad	7 Dec 2009 06:44:56 -0000	1.2
+--- cmd/Kinput2.ad.orig	2002-10-03 09:35:26 UTC
++++ cmd/Kinput2.ad
 @@ -32,9 +32,12 @@ Kinput2.height: 1
  !!
  !!	Wnn setup

Modified: head/japanese/kinput2/files/patch-lib_CcWnn.c
==============================================================================
--- head/japanese/kinput2/files/patch-lib_CcWnn.c	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/kinput2/files/patch-lib_CcWnn.c	Fri May 13 19:24:51 2016	(r415138)
@@ -3,9 +3,8 @@ Index: lib/CcWnn.c
 RCS file: /home/cvs/private/hrs/kinput2/lib/CcWnn.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -u -p -r1.1.1.1 -r1.2
---- lib/CcWnn.c	7 Dec 2009 06:36:04 -0000	1.1.1.1
-+++ lib/CcWnn.c	7 Dec 2009 06:44:58 -0000	1.2
+--- lib/CcWnn.c.orig	2002-10-03 09:35:27 UTC
++++ lib/CcWnn.c
 @@ -18,6 +18,8 @@ static char *rcsid = "$Id: CcWnn.c,v 1.5
   * Author:  Makoto Ishisone, Software Research Associates, Inc., Japan
   */

Modified: head/japanese/kinput2/files/patch-lib_IMProto.c
==============================================================================
--- head/japanese/kinput2/files/patch-lib_IMProto.c	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/kinput2/files/patch-lib_IMProto.c	Fri May 13 19:24:51 2016	(r415138)
@@ -3,9 +3,8 @@ Index: lib/IMProto.c
 RCS file: /home/cvs/private/hrs/kinput2/lib/IMProto.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -u -p -r1.1.1.1 -r1.2
---- lib/IMProto.c	7 Dec 2009 06:36:04 -0000	1.1.1.1
-+++ lib/IMProto.c	7 Dec 2009 06:44:58 -0000	1.2
+--- lib/IMProto.c.orig	2002-10-03 09:35:28 UTC
++++ lib/IMProto.c
 @@ -259,7 +259,7 @@ Cardinal *num_args;
  #ifdef IM_TCP_TRANSPORT
      if (ipw->imp.use_tcp_transport) {

Modified: head/japanese/kinput2/files/patch-lib_cconv.c
==============================================================================
--- head/japanese/kinput2/files/patch-lib_cconv.c	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/kinput2/files/patch-lib_cconv.c	Fri May 13 19:24:51 2016	(r415138)
@@ -3,9 +3,8 @@ Index: lib/cconv.c
 RCS file: /home/cvs/private/hrs/kinput2/lib/cconv.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.3
-diff -u -p -r1.1.1.1 -r1.3
---- lib/cconv.c	7 Dec 2009 06:36:04 -0000	1.1.1.1
-+++ lib/cconv.c	7 Dec 2009 06:50:44 -0000	1.3
+--- lib/cconv.c.orig	2002-10-03 09:35:28 UTC
++++ lib/cconv.c
 @@ -604,6 +604,7 @@ static char	*rcsid = "$Id: cconv.c,v 10.
  #endif
  
@@ -85,7 +84,15 @@ diff -u -p -r1.1.1.1 -r1.3
  #define FUNCSIZE	20
  #define MOREFUNCSIZE	20
  typedef struct {
-@@ -797,7 +793,7 @@ static int newMode(ccRule, Files *, _str
+@@ -790,14 +786,14 @@ static wchar *promptsave(wchar *);
+ static int parseLine(uchar *, uchar **, int);
+ static FILE *openfile(char *);
+ static int doinclude(uchar *, Files *, void (*)());
+-static uchar *getline(uchar *, int, Files *, void (*)());
++static uchar *get_line(uchar *, int, Files *, void (*)());
+ static int readRuleFile(ccRule, char *);
+ static int registMode(ccRule, int, uchar **);
+ static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *,
  		   _funcnameRec *, int, uchar **);
  static int getDesc(ccRule, uchar *, _funcbufRec *, _funcnameRec *,
  		   ulong *, int *, wchar *, wchar *, int *);
@@ -119,15 +126,29 @@ diff -u -p -r1.1.1.1 -r1.3
  static int funcalloc();
  static void funcadjust();
  static int funcsearch();
-@@ -1098,7 +1090,7 @@ char *file;
+@@ -1035,8 +1027,8 @@ void (*efunc)();
+ 	return 0;
+ }
+ 
+-/* getline -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
+-static uchar *getline(line, linesize, files, efunc)
++/* get_line -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
++static uchar *get_line(line, linesize, files, efunc)
+ uchar *line;
+ int linesize;
+ Files *files;
+@@ -1098,9 +1090,9 @@ char *file;
  	fnrec.funcnamebuf = NULL;
  
  	rule->nmode = 0;
 -	rule->initialmode = -1;
 +	rule->initialmode = NULL;
  
- 	while (getline(line, sizeof(line), &files, efunc)) {
+-	while (getline(line, sizeof(line), &files, efunc)) {
++	while (get_line(line, sizeof(line), &files, efunc)) {
  		(void)Strcpy(tmp, line);
+ 		if ((argc = parseLine(tmp, argv, 20)) == 0)
+ 			continue;
 @@ -1191,33 +1183,42 @@ int ac;
  uchar **av;
  {
@@ -182,7 +203,7 @@ diff -u -p -r1.1.1.1 -r1.3
  	return 0;
  }
  
-@@ -1238,35 +1239,39 @@ uchar **av;
+@@ -1238,38 +1239,42 @@ uchar **av;
  	wchar		prompt[30], context[100], result[100];
  	int		func;
  	int		ndesc = 0;
@@ -231,7 +252,11 @@ diff -u -p -r1.1.1.1 -r1.3
 +	cdp = cd_head;
  
  	/* $B%k!<%k$rFI$s$G%9%H%"$9$k(B */
- 	while (getline(line, sizeof(line), files, efunc)) {
+-	while (getline(line, sizeof(line), files, efunc)) {
++	while (get_line(line, sizeof(line), files, efunc)) {
+ 		/* '#' $B$G;O$^$k9T$O%3%a%s%H(B */
+ 		if (*line == '\0' || *line == '\n' || *line == '#')
+ 			continue;
 @@ -1277,9 +1282,11 @@ uchar **av;
  			break;
  		if (getDesc(rule, line, frec, fnrec, &inkey, &modmask,

Modified: head/japanese/kinput2/files/patch-lib_imlib_imconv.c
==============================================================================
--- head/japanese/kinput2/files/patch-lib_imlib_imconv.c	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/kinput2/files/patch-lib_imlib_imconv.c	Fri May 13 19:24:51 2016	(r415138)
@@ -3,9 +3,8 @@ Index: lib/imlib/imconv.c
 RCS file: /home/cvs/private/hrs/kinput2/lib/imlib/imconv.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -u -p -r1.1.1.1 -r1.2
---- lib/imlib/imconv.c	7 Dec 2009 06:36:04 -0000	1.1.1.1
-+++ lib/imlib/imconv.c	7 Dec 2009 06:44:58 -0000	1.2
+--- lib/imlib/imconv.c.orig	2002-10-03 09:35:30 UTC
++++ lib/imlib/imconv.c
 @@ -591,6 +591,9 @@ OCCPreeditDrawArg *data;
  	}
      }

Modified: head/japanese/kinput2/files/patch-lib_imlib_imfuncs.h
==============================================================================
--- head/japanese/kinput2/files/patch-lib_imlib_imfuncs.h	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/kinput2/files/patch-lib_imlib_imfuncs.h	Fri May 13 19:24:51 2016	(r415138)
@@ -3,9 +3,8 @@ Index: lib/imlib/imfuncs.h
 RCS file: /home/cvs/private/hrs/kinput2/lib/imlib/imfuncs.h,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -u -p -r1.1.1.1 -r1.2
---- lib/imlib/imfuncs.h	7 Dec 2009 06:36:04 -0000	1.1.1.1
-+++ lib/imlib/imfuncs.h	7 Dec 2009 06:44:58 -0000	1.2
+--- lib/imlib/imfuncs.h.orig	2002-10-03 09:35:30 UTC
++++ lib/imlib/imfuncs.h
 @@ -60,7 +60,7 @@ extern void IMSendBadLength _Pt_((IMConn
  /*
   * Transport layer functions (defined in imxport.c)

Modified: head/japanese/kinput2/files/patch-lib_imlib_imxport.c
==============================================================================
--- head/japanese/kinput2/files/patch-lib_imlib_imxport.c	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/kinput2/files/patch-lib_imlib_imxport.c	Fri May 13 19:24:51 2016	(r415138)
@@ -3,9 +3,8 @@ Index: lib/imlib/imxport.c
 RCS file: /home/cvs/private/hrs/kinput2/lib/imlib/imxport.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -u -p -r1.1.1.1 -r1.2
---- lib/imlib/imxport.c	7 Dec 2009 06:36:04 -0000	1.1.1.1
-+++ lib/imlib/imxport.c	7 Dec 2009 06:44:58 -0000	1.2
+--- lib/imlib/imxport.c.orig	2002-10-03 09:35:31 UTC
++++ lib/imlib/imxport.c
 @@ -31,10 +31,12 @@ static char *rcsid = "$Id: imxport.c,v 1
  
  #ifdef IM_UNIX_TRANSPORT

Modified: head/japanese/mh/files/patch-conf__makefiles__uip
==============================================================================
--- head/japanese/mh/files/patch-conf__makefiles__uip	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/mh/files/patch-conf__makefiles__uip	Fri May 13 19:24:51 2016	(r415138)
@@ -1,6 +1,6 @@
---- conf/makefiles/uip.orig	2001-05-30 23:57:47.000000000 +0900
-+++ conf/makefiles/uip	2014-10-13 17:55:46.000000000 +0900
-@@ -995,10 +995,6 @@
+--- conf/makefiles/uip.orig	2001-05-30 14:57:47 UTC
++++ conf/makefiles/uip
+@@ -995,10 +995,6 @@ $(ETCDIR)/rcvtty:	xrcvtty
  		-chmod g-s zrcvtty
  		$(CP) xrcvtty $@
  		-@chmod $(PGMPROT) $@

Modified: head/japanese/mh/files/patch-configure
==============================================================================
--- head/japanese/mh/files/patch-configure	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/mh/files/patch-configure	Fri May 13 19:24:51 2016	(r415138)
@@ -1,6 +1,6 @@
---- configure.orig	2001-06-15 01:41:51.000000000 +0900
-+++ configure	2014-10-08 22:52:42.000000000 +0900
-@@ -1397,14 +1397,8 @@
+--- configure.orig	2001-06-14 16:41:51 UTC
++++ configure
+@@ -1397,14 +1397,8 @@ case "$host_os" in
      if test "$use_sharedlib" != no
      then
        sharedlib=fbsd
@@ -9,13 +9,14 @@
 -	if test x`/usr/bin/objformat` = xelf
 -	then
  	  sharedlib=gnuelf
- 	  make_mhconfig='CFLAGS="-O -DMHSLIB_NOMINVER"'
+-	  make_mhconfig='CFLAGS="-O -DMHSLIB_NOMINVER"'
 -	fi
 -      fi
++	  make_mhconfig='CFLAGS="-O2 -pipe  -Wno-return-type -fstack-protector -fno-strict-aliasing -DMHSLIB_NOMINVER"'
        echo __ELF__ | $CC -E - | grep -q __ELF__ || sharedlib=gnuelf
        slflags="-fpic"
        slibdir=$libdir
-@@ -1748,34 +1742,6 @@
+@@ -1748,34 +1742,6 @@ test -n "$pager" || pager="/usr/ucb/more
    pagerpath="$ac_cv_path_pager"
  fi
  

Added: head/japanese/mh/files/patch-h_mh.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/mh/files/patch-h_mh.h	Fri May 13 19:24:51 2016	(r415138)
@@ -0,0 +1,12 @@
+Index: h/mh.h
+--- h/mh.h.orig	1998-12-01 17:05:00 UTC
++++ h/mh.h
+@@ -253,7 +253,7 @@ void	ambigsw ();
+ int     atooi ();
+ char  **brkstring ();
+ void	closefds ();
+-char   *concat ();
++char   *concat (char *, ...);
+ char   *copy ();
+ char  **copyip ();
+ void	cpydata ();

Added: head/japanese/mh/files/patch-sbr_concat.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/mh/files/patch-sbr_concat.c	Fri May 13 19:24:51 2016	(r415138)
@@ -0,0 +1,55 @@
+--- sbr/concat.c.orig	1993-12-01 04:01:21 UTC
++++ sbr/concat.c
+@@ -2,34 +2,40 @@
+ 
+ #include "../h/mh.h"
+ #include <stdio.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ 
+ 
+ /* VARARGS */
+ 
+-char   *concat (va_alist)
+-va_dcl
++char   *concat (char *first, ...)
+ {
+     register char  *cp,
+                    *dp,
+                    *sp;
+     register unsigned   len;
+-    register    va_list list;
++    va_list list;
+ 
+     len = 1;
+-    va_start (list); 
+-    while (cp = va_arg (list, char *))
+-	len += strlen (cp);
+-    va_end (list);
++    if (first) {
++	    len += strlen (first);
++	    va_start (list, first);
++	    while (cp = va_arg (list, char *))
++		    len += strlen (cp);
++	    va_end (list);
++    }
+ 
+     dp = sp = malloc (len);
+     if (dp == NULL)
+ 	adios (NULLCP, "unable to allocate string storage");
+ 
+-    va_start (list); 
+-    while (cp = va_arg (list, char *))
+-	sp = copy (cp, sp);
+-    va_end (list);
++    *sp = '\0';
++    if (first) {
++	    sp = copy (first, sp);
++	    va_start (list, first);
++	    while (cp = va_arg (list, char *))
++		    sp = copy (cp, sp);
++	    va_end (list);
++    }
+ 
+     return dp;
+ }

Added: head/japanese/mh/files/patch-support_pop_popser.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/mh/files/patch-support_pop_popser.c	Fri May 13 19:24:51 2016	(r415138)
@@ -0,0 +1,29 @@
+--- support/pop/popser.c.orig	1999-02-09 11:30:00 UTC
++++ support/pop/popser.c
+@@ -259,7 +259,7 @@ static		p_cmatch(), p_isdate(), p_ishead
+ extern	int	mbx_read ();
+ 
+ static int	setup(), setupaux(), read_map(), read_file(), pmbx_size();
+-static int	quitaux(), quitfile(), respond(), getline();
++static int	quitaux(), quitfile(), respond(), get_line();
+ static	m_gMsgs(), multiline(), multiend(), putline();
+ /*  */
+ 
+@@ -410,7 +410,7 @@ char   *rhost;
+     (void) respond (OK, "%s ready %s", server, timestamp);
+ 
+     for (mystate = auth1; mystate != halt && mystate != error;)
+-	switch (getline (buffer, sizeof buffer, input)) {
++	switch (get_line (buffer, sizeof buffer, input)) {
+ 	    case OK: 
+ 		if ((v = getvector (buffer, vec)) == NULL)
+ 		    continue;
+@@ -1850,7 +1850,7 @@ static  multiend () {
+ 
+ /*  */
+ 
+-static int  getline (s, n, iop)
++static int  get_line (s, n, iop)
+ register char  *s;
+ register int	n;
+ register FILE  *iop;

Modified: head/japanese/mh/files/patch-uip_msh.c
==============================================================================
--- head/japanese/mh/files/patch-uip_msh.c	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/mh/files/patch-uip_msh.c	Fri May 13 19:24:51 2016	(r415138)
@@ -1,6 +1,6 @@
---- uip/msh.c
+--- uip/msh.c.orig	2001-06-14 16:41:30 UTC
 +++ uip/msh.c
-@@ -17,14 +17,7 @@
+@@ -17,14 +17,7 @@ static char ident[] = "@(#)$Id: msh.c,v 
  #include <ctype.h>
  #include <sys/types.h>
  #include <sys/stat.h>

Added: head/japanese/mh/files/patch-uip_popsbr.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/mh/files/patch-uip_popsbr.c	Fri May 13 19:24:51 2016	(r415138)
@@ -0,0 +1,47 @@
+--- uip/popsbr.c.orig	2001-04-02 10:50:01 UTC
++++ uip/popsbr.c
+@@ -63,7 +63,7 @@ int	command(), multiline();
+ static	int	command(), multiline();
+ #endif
+ 
+-static int	getline();
++static int	get_line();
+ static putline();
+ 
+ #ifdef NNTP
+@@ -176,7 +176,7 @@ int	snoop;
+ 
+     (void) signal (SIGPIPE, SIG_IGN);
+ 
+-    switch (getline (response, sizeof response, input)) {
++    switch (get_line (response, sizeof response, input)) {
+ 	case OK: 
+ 	    if (poprint)
+ 		fprintf (stderr, "<--- %s\n", response);
+@@ -619,7 +619,7 @@ char   *fmt,
+     if (putline (buffer, output) == NOTOK)
+ 	return NOTOK;
+ 
+-    switch (getline (response, sizeof response, input)) {
++    switch (get_line (response, sizeof response, input)) {
+ 	case OK: 
+ 	    if (poprint)
+ 		fprintf (stderr, "<--- %s\n", response);
+@@ -645,7 +645,7 @@ static int  multiline () {
+ #endif
+     char    buffer[BUFSIZ + TRMLEN];
+ 
+-    if (getline (buffer, sizeof buffer, input) != OK)
++    if (get_line (buffer, sizeof buffer, input) != OK)
+ 	return NOTOK;
+ #ifdef	DEBUG
+     if (poprint)
+@@ -665,7 +665,7 @@ static int  multiline () {
+ 
+ /*  */
+ 
+-static int  getline (s, n, iop)
++static int  get_line (s, n, iop)
+ char   *s;
+ int     n;
+ FILE * iop;

Modified: head/japanese/mh/files/patch-uip_prompter.c
==============================================================================
--- head/japanese/mh/files/patch-uip_prompter.c	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/mh/files/patch-uip_prompter.c	Fri May 13 19:24:51 2016	(r415138)
@@ -1,6 +1,6 @@
---- uip/prompter.c
+--- uip/prompter.c.orig	1998-04-23 21:02:00 UTC
 +++ uip/prompter.c
-@@ -6,15 +6,7 @@
+@@ -6,15 +6,7 @@ static char ident[] = "@(#)$Id: prompter
  #include "../h/mh.h"
  #include <stdio.h>
  #include <errno.h>
@@ -17,7 +17,7 @@
  #if defined(BSD42) || defined(SVR4)
  #include <setjmp.h>
  #endif	/* BSD42 || SVR4 */
-@@ -71,19 +63,10 @@
+@@ -71,19 +63,10 @@ static struct swit switches[] = {
  extern int  errno;
  
  
@@ -38,7 +38,7 @@
  
  
  static TYPESIG	intrser ();
-@@ -209,29 +192,14 @@
+@@ -209,29 +192,14 @@ char   *argv[];
      (void) chmod (tmpfil, 0600);
  
      if (killp || erasep) {
@@ -49,15 +49,14 @@
 -	char   serase,
 -	       skill;
 -#endif	/* SYS5 */
--
++	cc_t serase, skill;
+ 
 -#ifndef	SYS5
 -	(void) ioctl (0, TIOCGETP, (char *) &sg);
 -	(void) ioctl (0, TIOCGETC, (char *) &tc);
 -#else	/* SYS5 */
 -	(void) ioctl(0, TCGETA, &sg);
 -#endif	/* SYS5 */
-+	cc_t serase, skill;
-+
 +	(void) tcgetattr(0, &sg);
  	skill = KILL;
  	serase = ERASE;
@@ -72,7 +71,7 @@
  
  	chrdsp ("erase", ERASE);
  	chrdsp (", kill", KILL);
-@@ -273,11 +241,7 @@
+@@ -273,11 +241,7 @@ char   *argv[];
  		    if (i == -1) {
  abort: ;
  			if (killp || erasep)
@@ -85,7 +84,7 @@
  			(void) unlink (tmpfil);
  			done (1);
  		    }
-@@ -365,11 +329,7 @@
+@@ -365,11 +329,7 @@ no_body: ;
  /*  */
  
      if (killp || erasep)

Added: head/japanese/mh/files/patch-uip_pshsbr.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/mh/files/patch-uip_pshsbr.c	Fri May 13 19:24:51 2016	(r415138)
@@ -0,0 +1,47 @@
+--- uip/pshsbr.c.orig	2001-04-02 10:50:24 UTC
++++ uip/pshsbr.c
+@@ -63,7 +63,7 @@ int	command(), multiline();
+ static	int	command(), multiline();
+ #endif
+ 
+-static int	getline();
++static int	get_line();
+ static putline();
+ 
+ #ifdef NNTP
+@@ -176,7 +176,7 @@ int	snoop;
+ 
+     (void) signal (SIGPIPE, SIG_IGN);
+ 
+-    switch (getline (response, sizeof response, input)) {
++    switch (get_line (response, sizeof response, input)) {
+ 	case OK: 
+ 	    if (poprint)
+ 		fprintf (stderr, "<--- %s\n", response);
+@@ -619,7 +619,7 @@ char   *fmt,
+     if (putline (buffer, output) == NOTOK)
+ 	return NOTOK;
+ 
+-    switch (getline (response, sizeof response, input)) {
++    switch (get_line (response, sizeof response, input)) {
+ 	case OK: 
+ 	    if (poprint)
+ 		fprintf (stderr, "<--- %s\n", response);
+@@ -645,7 +645,7 @@ static int  multiline () {
+ #endif
+     char    buffer[BUFSIZ + TRMLEN];
+ 
+-    if (getline (buffer, sizeof buffer, input) != OK)
++    if (get_line (buffer, sizeof buffer, input) != OK)
+ 	return NOTOK;
+ #ifdef	DEBUG
+     if (poprint)
+@@ -665,7 +665,7 @@ static int  multiline () {
+ 
+ /*  */
+ 
+-static int  getline (s, n, iop)
++static int  get_line (s, n, iop)
+ char   *s;
+ int     n;
+ FILE * iop;

Added: head/japanese/mh/files/patch-uip_rcvtty.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/mh/files/patch-uip_rcvtty.c	Fri May 13 19:24:51 2016	(r415138)
@@ -0,0 +1,62 @@
+--- uip/rcvtty.c.orig	2001-04-04 16:05:17 UTC
++++ uip/rcvtty.c
+@@ -8,11 +8,16 @@ static char ident[] = "@(#)$Id: rcvtty.c
+ #endif
+ #include "../h/mh.h"
+ #include "../h/rcvmail.h"
++#include "../h/formatsbr.h"
+ #include "../h/scansbr.h"
+ #include "../zotnet/tws.h"
+ #include <signal.h>
+ #include <sys/stat.h>
++#include <sys/param.h>
+ #ifndef	TTYD
++#if __FreeBSD_version > 900007
++#include <utmpx.h>
++#else /* __FreeBSD_version > 900007 */
+ #include <utmp.h>
+ #ifndef UTMP_FILENAME
+ #ifdef UTMP_FILE
+@@ -25,6 +30,7 @@ static char ident[] = "@(#)$Id: rcvtty.c
+ #endif
+ #endif
+ #endif	/* UTMP_FILENAME */
++#endif /* __FreeBSD_version > 900007 */
+ #endif	/* not TTYD */
+ #ifdef LOCALE
+ #include	<locale.h>
+@@ -110,8 +116,12 @@ char   **argv;
+ 	   *vec[MAXARGS];
+ #ifndef	TTYD
+     char    tty[BUFSIZ];
++#if __FreeBSD_version > 900007
++    struct utmpx *ut;
++#else /* __FreeBSD_version > 900007 */
+     struct utmp ut;
+     register FILE  *uf;
++#endif /* __FreeBSD_version > 900007 */
+ #endif	/* not TTYD */
+ 
+ #ifdef BSD43
+@@ -200,6 +210,13 @@ char   **argv;
+ 
+     user = getusr ();
+ #ifndef	TTYD
++#if __FreeBSD_version > 900007
++    ut = getutxuser(user);
++    if (ut != NULL) {
++	(void) strncpy (tty, ut->ut_line, sizeof ut->ut_line);
++	alert (tty, md);
++    }
++#else /* __FreeBSD_version > 900007 */
+     if ((uf = fopen (UTMP_FILENAME, "r")) == NULL)
+ 	exit (RCV_MBX);
+     while (fread ((char *) &ut, sizeof ut, 1, uf) == 1)
+@@ -212,6 +229,7 @@ char   **argv;
+ 	    alert (tty, md);
+ 	}
+     (void) fclose (uf);
++#endif /* __FreeBSD_version > 900007 */
+ #else	/* TTYD */
+     alert (user, md);
+ #endif	/* TTYD */

Added: head/japanese/mh/files/patch-uip_replsbr.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/mh/files/patch-uip_replsbr.c	Fri May 13 19:24:51 2016	(r415138)
@@ -0,0 +1,16 @@
+--- uip/replsbr.c.orig	2001-04-04 16:05:17 UTC
++++ uip/replsbr.c
+@@ -195,11 +195,12 @@ replout (inb, msg, drft, mp)
+ 			}
+ 		    } while (cptr = cptr->c_next);
+ 
+-		while (state == FLDPLUS)
++		while (state == FLDPLUS) {
+ 		    state = m_getfld (state, name, tmpbuf, SBUFSIZ, inb);
+ #ifdef JAPAN
+ 	            (void) ml_conv(tmpbuf);
+ #endif /* JAPAN */
++		}
+ 		break;
+ 
+ 	    case LENERR: 

Added: head/japanese/mh/files/patch-uip_slocal.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/mh/files/patch-uip_slocal.c	Fri May 13 19:24:51 2016	(r415138)
@@ -0,0 +1,54 @@
+--- uip/slocal.c.orig	2000-12-04 12:09:38 UTC
++++ uip/slocal.c
+@@ -36,6 +36,10 @@ static char ident[] = "@(#)$Id: slocal.c
+ #endif	/* NOIOCTLH */
+ #endif	/* not V7 */
+ #include <sys/stat.h>
++#include <sys/param.h>
++#if __FreeBSD_version > 900007
++#include <utmpx.h>
++#else /* __FreeBSD_version > 900007 */
+ #include <utmp.h>
+ #ifndef UTMP_FILENAME
+ #ifdef UTMP_FILE
+@@ -48,6 +52,7 @@ static char ident[] = "@(#)$Id: slocal.c
+ #endif
+ #endif
+ #endif	/* UTMP_FILENAME */
++#endif /* __FreeBSD_version > 900007 */
+ #ifdef LOCALE
+ #include	<locale.h>
+ #endif
+@@ -938,6 +943,24 @@ register char  *key;
+ 
+ /*  */
+ 
++#if __FreeBSD_version > 900007
++static int  logged_in (void) {
++    if (utmped) {
++	return utmped;
++    }
++    else {
++	struct utmpx* ut = NULL;
++
++	ut = getutxuser(user);
++	if (ut != NULL) {
++	    return (utmped = DONE);
++	}
++	else {
++	    return (utmped = NOTOK);
++	}
++    }
++}
++#else /* __FreeBSD_version > 900007 */
+ static int  logged_in () {
+     struct utmp ut;
+     register FILE  *uf;
+@@ -963,6 +986,7 @@ static int  logged_in () {
+     (void) fclose (uf);
+     return (utmped = NOTOK);
+ }
++#endif /* __FreeBSD_version > 900007 */
+ 
+ 
+ static int  timely (t1, t2)

Modified: head/japanese/mh/files/patch-uip_trmsbr.c
==============================================================================
--- head/japanese/mh/files/patch-uip_trmsbr.c	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/mh/files/patch-uip_trmsbr.c	Fri May 13 19:24:51 2016	(r415138)
@@ -1,6 +1,6 @@
---- uip/trmsbr.c
+--- uip/trmsbr.c.orig	1993-12-01 04:01:39 UTC
 +++ uip/trmsbr.c
-@@ -5,19 +5,8 @@
+@@ -5,19 +5,8 @@ static char ident[] = "@(#)$Id: trmsbr.c
  
  #include "../h/mh.h"
  #include <stdio.h>
@@ -21,7 +21,7 @@
  
  
  #if	BUFSIZ<2048
-@@ -58,11 +47,7 @@
+@@ -58,11 +47,7 @@ static  read_termcap () {
                     *term;
      char   *cp,
  	    myterm[TXTSIZ];
@@ -34,7 +34,7 @@
      static int  inited = 0;
  
      if (inited++)
-@@ -71,13 +56,7 @@
+@@ -71,13 +56,7 @@ static  read_termcap () {
      if ((term = getenv ("TERM")) == NULL || tgetent (myterm, term) <= OK)
  	return;
  

Added: head/japanese/mh/files/patch-uip_vmh.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/mh/files/patch-uip_vmh.c	Fri May 13 19:24:51 2016	(r415138)
@@ -0,0 +1,16 @@
+--- uip/vmh.c.orig	2001-04-21 11:16:49 UTC
++++ uip/vmh.c
+@@ -116,6 +116,13 @@ void     __cputchar __P((int));
+ 
+ #define	XYZ			/* XXX */
+ 
++#if defined(__FreeBSD__) && __FreeBSD__ >= 5
++struct ldat
++{
++	unsigned long	*text;
++};
++#endif
++
+ /*  */
+ 
+ static struct swit switches[] = {

Modified: head/japanese/prn/files/patch-Makefile
==============================================================================
--- head/japanese/prn/files/patch-Makefile	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/prn/files/patch-Makefile	Fri May 13 19:24:51 2016	(r415138)
@@ -1,82 +1,51 @@
-*** Makefile.orig	Wed May 11 17:00:58 1994
---- Makefile	Tue Jul  1 17:44:49 1997
-***************
-*** 25,35 ****
-  #	@(#)Makefile 2.3 (Y.Tonooka) 5/11/94
-  #-
-  
-!           BINPATH = /usr/local/bin
-!           LIBPATH = /usr/local/lib
-!           MANPATH = /usr/local/man
-!           JMANDIR = japanese
-!            CFLAGS = -O
-  #           CFLAGS = -g -DDEBUG
-            ARFLAGS = rcv
-  
---- 25,39 ----
-  #	@(#)Makefile 2.3 (Y.Tonooka) 5/11/94
-  #-
-  
-!           PREFIX?=/usr/local
-!           BINPATH = ${PREFIX}/bin
-!           LIBPATH = ${PREFIX}/share/prn
-!           MANPATH = ${PREFIX}/man
-!           JMANDIR = ja
-!            CFLAGS += \
-! 		-DKCCPATH=\"${PREFIX}/bin/kcc\" \
-! 		-DCMTPATH=\"${PREFIX}/bin/cmt\" \
-! 		-DPSPATH=\"${PREFIX}/bin/psconv\"
-  #           CFLAGS = -g -DDEBUG
-            ARFLAGS = rcv
-  
-***************
-*** 39,47 ****
-                 AR = ar
-             RANLIB = ranlib
-               LINT = lint
-!           INSTALL = install
-                 CP = cp
-!                LN = ln
-                 RM = rm -f
-               TAGS = ctags
-              ETAGS = etags
---- 43,51 ----
-                 AR = ar
-             RANLIB = ranlib
-               LINT = lint
-!           INSTALL = install -c
-                 CP = cp
-!                LN = ln -fs
-                 RM = rm -f
-               TAGS = ctags
-              ETAGS = etags
-***************
-*** 91,103 ****
-  
-  $(BINPATH)/cprn: $(BINPATH)/prn
-  	if [ $@ ]; then $(RM) $@; fi
-! 	$(LN) $(BINPATH)/prn $@
-  
-  $(BINPATH)/cmt: cmt.c defs.c euc.c reg.y
-  	$(MAKE) cmt
-  	$(INSTALL) -s cmt $(BINPATH)
-  
-  $(LIBPATH)/cmtdefs: cmtdefs
-  	$(CP) cmtdefs $@; chmod 644 $@
-  
-  $(BINPATH)/psconv: psconv.c
---- 95,108 ----
-  
-  $(BINPATH)/cprn: $(BINPATH)/prn
-  	if [ $@ ]; then $(RM) $@; fi
-! 	$(LN) prn $@
-  
-  $(BINPATH)/cmt: cmt.c defs.c euc.c reg.y
-  	$(MAKE) cmt
-  	$(INSTALL) -s cmt $(BINPATH)
-  
-  $(LIBPATH)/cmtdefs: cmtdefs
-+ 	mkdir -p $(LIBPATH)
-  	$(CP) cmtdefs $@; chmod 644 $@
-  
-  $(BINPATH)/psconv: psconv.c
+--- Makefile.orig	1994-05-11 08:00:58 UTC
++++ Makefile
+@@ -25,11 +25,15 @@
+ #	@(#)Makefile 2.3 (Y.Tonooka) 5/11/94
+ #-
+ 
+-          BINPATH = /usr/local/bin
+-          LIBPATH = /usr/local/lib
+-          MANPATH = /usr/local/man
+-          JMANDIR = japanese
+-           CFLAGS = -O
++          PREFIX?=/usr/local
++          BINPATH = ${PREFIX}/bin
++          LIBPATH = ${PREFIX}/share/prn
++          MANPATH = ${PREFIX}/man
++          JMANDIR = ja
++           CFLAGS += \
++		-DKCCPATH=\"${PREFIX}/bin/kcc\" \
++		-DCMTPATH=\"${PREFIX}/bin/cmt\" \
++		-DPSPATH=\"${PREFIX}/bin/psconv\"
+ #           CFLAGS = -g -DDEBUG
+           ARFLAGS = rcv
+ 
+@@ -39,9 +43,9 @@
+                AR = ar
+            RANLIB = ranlib
+              LINT = lint
+-          INSTALL = install
++          INSTALL = install -c
+                CP = cp
+-               LN = ln
++               LN = ln -fs
+                RM = rm -f
+              TAGS = ctags
+             ETAGS = etags
+@@ -91,13 +95,14 @@ $(BINPATH)/prn: prn.c euc.c
+ 
+ $(BINPATH)/cprn: $(BINPATH)/prn
+ 	if [ $@ ]; then $(RM) $@; fi
+-	$(LN) $(BINPATH)/prn $@
++	$(LN) prn $@
+ 
+ $(BINPATH)/cmt: cmt.c defs.c euc.c reg.y
+ 	$(MAKE) cmt
+ 	$(INSTALL) -s cmt $(BINPATH)
+ 
+ $(LIBPATH)/cmtdefs: cmtdefs
++	mkdir -p $(LIBPATH)
+ 	$(CP) cmtdefs $@; chmod 644 $@
+ 
+ $(BINPATH)/psconv: psconv.c

Modified: head/japanese/prn/files/patch-cmt.c
==============================================================================
--- head/japanese/prn/files/patch-cmt.c	Fri May 13 19:06:58 2016	(r415137)
+++ head/japanese/prn/files/patch-cmt.c	Fri May 13 19:24:51 2016	(r415138)
@@ -1,6 +1,6 @@
---- cmt.c.orig	Mon Apr 25 16:26:57 1994
-+++ cmt.c	Fri Feb  6 00:18:46 2004
-@@ -27,7 +27,9 @@
+--- cmt.c.orig	1994-04-25 07:26:57 UTC
++++ cmt.c
+@@ -27,7 +27,9 @@ static char *sccsid = "@(#)cmt.c 2.2 (Y.
  #endif
  
  #include <stdio.h>

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***