Update to texlive 2014 version.

   * fread.c (copy_multibyte_char): Avoid ambiguous operation.
   * fread.c: Add copy_multibyte_char() to
     copy multibyte character correctly.
   * fread.c: Wide char is not always even bytes in getestr().
   * convert.c: Add (unsigned char*) cast arg1 of UTF8StoUCS().
   * fwrite.c: Declare fprint_euc_char() as static.
   * main.c: Add TeX Live version.
   * {main,convert,fread,fwrite,styfile}.c, kana.h,
     mendex.doc, mendex.1: Add a new option -I to switch
     internal buffers for key words to EUC-JP or UTF-8.
   * mendex.1: Fix usage.
   * convert.c: Allow longer words in dictionary.
   * fwrite.c:  Make a buffer size larger.
   * fwrite.c: Replace sprintf with snprintf.
   * fread.c: Allow lines with only a line ending in mfgets(),
     because dictionary files with DOS line endings can't be read.

3 files changed, 9 insertions, 34 deletions

diff --git a/textproc/mendexk/Makefile b/textproc/mendexk/Makefile
index 28fa7c7804e..d299d36dd4b 100644
--- a/textproc/mendexk/Makefile
+++ b/textproc/mendexk/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2015/02/23 18:28:52 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2015/04/25 10:03:52 markd Exp $
 
-DISTNAME=	texlive-20130530-source
+DISTNAME=	texlive-20140525-source
 PKGNAME=	mendexk-2.6f
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2013/
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2014/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
@@ -32,5 +32,6 @@ CONFIGURE_ARGS+=	--with-system-kpathsea \
 		--with-ptexenc-libdir=${BUILDLINK_PREFIX.ptexenc}/lib
 
 .include "../../print/kpathsea/buildlink3.mk"
+BUILDLINK_API_DEPENDS.ptexenc+= ptexenc>=1.3.2
 .include "../../print/ptexenc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/mendexk/distinfo b/textproc/mendexk/distinfo
index af64c722eb7..c5f06811bd1 100644
--- a/textproc/mendexk/distinfo
+++ b/textproc/mendexk/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2014/02/13 00:58:22 minskim Exp $
+$NetBSD: distinfo,v 1.5 2015/04/25 10:03:52 markd Exp $
 
-SHA1 (texlive-20130530-source.tar.xz) = 42f0a6fa3f49435991182f14e01276b2ee3fce61
-RMD160 (texlive-20130530-source.tar.xz) = 2d779ae5de979be86a9258b224dfc15cbcd76b18
-Size (texlive-20130530-source.tar.xz) = 179963948 bytes
-SHA1 (patch-fwrite.c) = 39b81b60edd4d056260723962879aff6b340a677
+SHA1 (texlive-20140525-source.tar.xz) = 8cb283ad26b1fe18e1089820cf64ecc63d8224e8
+RMD160 (texlive-20140525-source.tar.xz) = c9fb954e63e700d06aa0cf40c37cdb40eaac84a2
+Size (texlive-20140525-source.tar.xz) = 41657688 bytes
diff --git a/textproc/mendexk/patches/patch-fwrite.c b/textproc/mendexk/patches/patch-fwrite.c
deleted file mode 100644
index 29901ca6095..00000000000
--- a/textproc/mendexk/patches/patch-fwrite.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-fwrite.c,v 1.1 2014/02/13 00:58:22 minskim Exp $
-
-Fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=534641.
-Patch from TeX Live svn r31621.
-
---- fwrite.c.orig	2012-10-16 08:06:04.000000000 +0000
-+++ fwrite.c
-@@ -15,7 +15,7 @@ static int range_check(struct index ind,
- static void linecheck(char *lbuff, char *tmpbuff);
- static void crcheck(char *lbuff, FILE *fp);
- 
--#define TAIL(x) (x+strlen(x))
-+#define TAIL(x) ((x)+strlen(x))
- 
- /* if we don't have vsnprintf() */
- /* #define vsnprintf(buff,len,format,argptr) vsprintf(buff,format,argptr) */
-@@ -385,7 +385,7 @@ static int range_check(struct index ind,
- 					}
- 					if (strlen(ind.p[j].enc)>0) {
- 						sprintf(tmpbuff,"%s%s%s",encap_prefix,ind.p[j].enc,encap_infix);
--						sprintf(tmpbuff,"%s%s%s",ind.p[j].page,encap_suffix,delim_n);
-+						sprintf(TAIL(tmpbuff),"%s%s%s",ind.p[j].page,encap_suffix,delim_n);
- 						linecheck(lbuff,tmpbuff);
- 					}
- 				}