Update TeXLive to 2014.

- Note that full support of configuration tools such as tlmgr and texconfig
  is not ready yet.

- Most of dviware now supports libpaper to choose the default papersize.
  Use paperconfig(8) utility or print/papersize-default-* packages.

- Some quite old macros of the age of latex209 have been removed, and
  there are user-visible/invisible incompatibilities.  Please send a report
  to freebsd-tex@FreeBSD.org or file a PR if you have trouble.

5 files changed, 55 insertions, 34 deletions

diff --git a/print/tex-ptexenc/Makefile b/print/tex-ptexenc/Makefile
index de13d5e4a1fb..96ad30ead040 100644
--- a/print/tex-ptexenc/Makefile
+++ b/print/tex-ptexenc/Makefile
@@ -1,19 +1,18 @@
 # $FreeBSD$
 
 PORTNAME=	ptexenc
-PORTVERSION=	1.3.0
-PORTREVISION=	2
+PORTVERSION=	1.3.2
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2014/
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-20120701-source
+DISTNAME=	texlive-20140525-source
 DIST_SUBDIR=	TeX
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Library for Japanese pTeX and its tools
 
 USES=		tar:xz libtool
-USE_TEX=	texlive kpathsea
+USE_TEX=	kpathsea
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/ptexenc
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES}
diff --git a/print/tex-ptexenc/distinfo b/print/tex-ptexenc/distinfo
index 8da00c3ff428..e1dface9f9c6 100644
--- a/print/tex-ptexenc/distinfo
+++ b/print/tex-ptexenc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TeX/texlive-20120701-source.tar.xz) = 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81
-SIZE (TeX/texlive-20120701-source.tar.xz) = 131904044
+SHA256 (TeX/texlive-20140525-source.tar.xz) = 08bb4eb02923ac65ce1183612c6b64da185904f26a1660f5ca4f902d055795be
+SIZE (TeX/texlive-20140525-source.tar.xz) = 41657688
diff --git a/print/tex-ptexenc/files/patch-Makefile.in b/print/tex-ptexenc/files/patch-Makefile.in
new file mode 100644
index 000000000000..614d3f8a0311
--- /dev/null
+++ b/print/tex-ptexenc/files/patch-Makefile.in
@@ -0,0 +1,12 @@
+--- Makefile.in.orig	2014-08-21 00:32:34.000000000 +0900
++++ Makefile.in	2014-08-21 00:33:04.000000000 +0900
+@@ -381,7 +381,8 @@
+ libptexenc_la_LIBADD = $(KPATHSEA_LIBS)
+ nobase_include_HEADERS = \
+ 	ptexenc/ptexenc.h \
+-	ptexenc/unicode.h
++	ptexenc/unicode.h \
++	ptexenc/unicode-jp.h
+ 
+ EXTRA_DIST = COPYRIGHT ChangeLog.jp
+ 
diff --git a/print/tex-ptexenc/files/patch-ptexenc.c b/print/tex-ptexenc/files/patch-ptexenc.c
index 385ae3f581bf..8d0edeef5db3 100644
--- a/print/tex-ptexenc/files/patch-ptexenc.c
+++ b/print/tex-ptexenc/files/patch-ptexenc.c
@@ -1,5 +1,5 @@
---- ptexenc.c.orig	2012-03-05 17:50:28.000000000 +0900
-+++ ptexenc.c	2013-05-10 13:31:02.000000000 +0900
+--- ptexenc.c.orig	2014-04-28 15:37:18.000000000 +0900
++++ ptexenc.c	2014-08-20 23:12:12.000000000 +0900
 @@ -15,6 +15,7 @@
  #include <ptexenc/unicode-jp.h>
  
@@ -8,29 +8,32 @@
  
  #define ENC_UNKNOWN  0
  #define ENC_JIS      1
-@@ -23,7 +24,42 @@
+@@ -23,10 +24,46 @@
  #define ENC_UTF8     4
  #define ENC_UPTEX    5
  
--static int default_kanji_enc = ENC_UTF8;
-+struct le {
+-static int default_kanji_enc;
++static int default_kanji_is_uptex;
+ static boolean UPTEX_enabled;
+ static boolean prior_file_enc = false;
+ 
++static struct le {
 +	char *name;
 +	int enc;
 +	int flag;
 +} letable[] = {
-+	{"*.UTF-8",	ENC_UTF8, FNM_NOESCAPE},
-+	{"*.eucJP",	ENC_EUC, FNM_NOESCAPE | FNM_CASEFOLD},
-+	{"*.EUC-JP",	ENC_EUC, FNM_NOESCAPE},
-+	{"*.EUC",	ENC_EUC, FNM_NOESCAPE | FNM_CASEFOLD},
-+	{"*.PCK",	ENC_SJIS, FNM_NOESCAPE | FNM_CASEFOLD},
-+	{"*.SJIS",	ENC_SJIS, FNM_NOESCAPE | FNM_CASEFOLD},
-+	{"*.ISO-2022-JP",	ENC_JIS, FNM_NOESCAPE | FNM_CASEFOLD},
++	{"*.UTF-8",     ENC_UTF8, FNM_NOESCAPE},
++	{"*.eucJP",     ENC_EUC, FNM_NOESCAPE | FNM_CASEFOLD},
++	{"*.EUC-JP",    ENC_EUC, FNM_NOESCAPE},
++	{"*.EUC",       ENC_EUC, FNM_NOESCAPE | FNM_CASEFOLD},
++	{"*.PCK",       ENC_SJIS, FNM_NOESCAPE | FNM_CASEFOLD},
++	{"*.SJIS",      ENC_SJIS, FNM_NOESCAPE | FNM_CASEFOLD},
++	{"*.ISO-2022-JP",       ENC_JIS, FNM_NOESCAPE | FNM_CASEFOLD},
 +	{NULL, 0, 0}
 +};
 +
-+static int default_kanji_is_uptex;
 +static int
-+default_kanji_enc()
++default_kanji_enc(void)
 +{
 +	struct le *le;
 +	const char *name;
@@ -45,14 +48,15 @@
 +	for (i = 0; letable[i].name != NULL; i++) {
 +		if (fnmatch(letable[i].name, name, letable[i].flag) !=
 +		    FNM_NOMATCH)
-+		return (letable[i].enc);
++			return (letable[i].enc);
 +	}
 +	return (ENC_UTF8);
 +}
- static boolean UPTEX_enabled;
- static boolean prior_file_enc = false;
++
+ #define ESC '\033'
  
-@@ -64,7 +100,7 @@
+ #ifndef NOFILE
+@@ -64,7 +101,7 @@
  static int string_to_enc(const_string str)
  {
      if (str == NULL)                    return ENC_UNKNOWN;
@@ -61,7 +65,7 @@
      if (strcasecmp(str, "jis")    == 0) return ENC_JIS;
      if (strcasecmp(str, "euc")    == 0) return ENC_EUC;
      if (strcasecmp(str, "sjis")   == 0) return ENC_SJIS;
-@@ -92,7 +128,7 @@
+@@ -92,7 +129,7 @@
      } else if (enc != ENC_UNKNOWN) {
          return enc;
      }
@@ -70,15 +74,20 @@
  }
  
  static void set_file_enc(int enc)
-@@ -150,9 +186,9 @@
+@@ -150,14 +187,14 @@
  {
      UPTEX_enabled = enable;
-     if (enable)
+     if (enable) {
 -        default_kanji_enc = ENC_UPTEX;
-+	default_kanji_is_uptex = 1;
-     else {
++        default_kanji_is_uptex = 1;
+         internal_enc = ENC_UPTEX;
+     } else {
+ #ifdef WIN32
+         default_kanji_enc = ENC_SJIS;
+         internal_enc = ENC_SJIS;
+ #else
 -        default_kanji_enc = ENC_UTF8;
-+	default_kanji_is_uptex = 0;
-         if (internal_enc == ENC_UPTEX)
-             internal_enc = ENC_EUC;
++        default_kanji_is_uptex = 0;
+         internal_enc = ENC_EUC;
+ #endif
      }
diff --git a/print/tex-ptexenc/pkg-plist b/print/tex-ptexenc/pkg-plist
index 8b7199193711..725bee686e5d 100644
--- a/print/tex-ptexenc/pkg-plist
+++ b/print/tex-ptexenc/pkg-plist
@@ -1,7 +1,8 @@
 include/ptexenc/ptexenc.h
 include/ptexenc/unicode.h
+include/ptexenc/unicode-jp.h
 @dirrm include/ptexenc
 lib/libptexenc.a
 lib/libptexenc.so
 lib/libptexenc.so.1
-lib/libptexenc.so.1.3.0
+lib/libptexenc.so.1.3.2